Merge remote-tracking branch 'shuffle2/vc12'

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
391 changed files with 104559 additions and 35674 deletions

View File

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