archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 02:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/master' into spurs_taskset

Browse source 
Conflicts:
	rpcs3/emucore.vcxproj.filters
This commit is contained in:
S Gopal Rajagopal 2015-02-03 23:12:26 +05:30
commit d1a7c85e95
184 changed files with 24421 additions and 5225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/stdafx.h
View file

@ -14,6 +14,8 @@
#endif
// This header should be frontend-agnostic, so don't assume wx includes everything
#pragma warning( disable : 4800 )
#include <cstdio>
#include <cstring>
#include <cassert>