piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues 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
2013-10-31 16:51:56 -04:00
parent 4c7bbd96e4 8dcd13cca7
commit 82729fcc8f
391 changed files with 104559 additions and 35674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/Src/stdafx.h
View File

@ -15,3 +15,5 @@
#endif
// TODO: reference additional headers your program requires here
#include <algorithm>