Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update ...

Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp

2012-03-22 17:57:38 -07:00

..

Src

Merge branch 'master' into wxw3-update

2012-03-22 17:57:38 -07:00

CMakeLists.txt

Fix the rest of the tooltips for linux.

2011-01-31 22:19:30 +00:00

Common.vcxproj

fix Common lib re-linking all the time

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

Common.vcxproj.filters

fix Common lib re-linking all the time

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

make_scmrev.h.js

Remove hash from revision description for cmake and windows.

2011-08-22 20:06:17 -05:00

SConscript

fixup scons (osx) to generate scmrev.h and build.

2011-08-23 03:50:06 -07:00

SVNRevGen.vcxproj

fix Common lib re-linking all the time

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