mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-10 01:59:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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>