Matthew Parlane b6e054a2be Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters

2013-08-23 00:51:12 +12:00

..

Src

Merge branch 'master' into wii-network

2013-08-23 00:51:12 +12:00

CMakeLists.txt

Merge branch 'master' into wii-network

2013-08-23 00:51:12 +12:00

Common.vcxproj

Merge branch 'master' into wii-network

2013-08-23 00:51:12 +12:00

Common.vcxproj.filters

Merge branch 'master' into wii-network

2013-08-23 00:51:12 +12:00

make_scmrev.h.js

Remove "-0" from stable version numbers in a more foolproof manner for vs and cmake builds.

2013-08-10 17:19:19 -05:00

SVNRevGen.vcxproj

fix Common lib re-linking all the time

2012-03-18 05:47:55 -07:00