Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shuffle2/vc12'

Browse Source 
Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters
This commit is contained in:
comex committed 2013-10-31 16:51:56 -04:00
2 parents 4c7bbd96e4 8dcd13cca7
commit 82729fcc8f
391 files changed
+104559 -35674
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/DiscIO/Src/stdafx.h
+2
View File
@@ -15,3 +15,5 @@
#endif
// TODO: reference additional headers your program requires here
#include <algorithm>