mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Merge remote-tracking branch 'shuffle2/vc12'
Conflicts: Source/Core/Common/Common.vcxproj Source/Core/Common/Common.vcxproj.filters
This commit is contained in:
@ -15,3 +15,5 @@
|
||||
#endif
|
||||
|
||||
// TODO: reference additional headers your program requires here
|
||||
|
||||
#include <algorithm>
|
||||
|
Reference in New Issue
Block a user