Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update ... Conflicts: Source/Core/DolphinWX/Src/LogWindow.cpp		2012-03-22 17:57:38 -07:00
..
resources
Src	Merge branch 'master' into wxw3-update	2012-03-22 17:57:38 -07:00
CMakeLists.txt	Fix Linux build: search for gthread-2.0 and pangocairo, then add both these libs to wx dependencies	2012-03-23 01:06:45 +01:00
Dolphin.vcxproj	remove scons files from VS projects	2012-03-18 06:41:12 -07:00
Dolphin.vcxproj.filters	remove scons files from VS projects	2012-03-18 06:41:12 -07:00
Dolphin.vcxproj.user
DolphinWX.rc
Info.plist.in	Applied compile and link flags from SCons build for OS X to CMake build.	2011-12-11 21:27:06 +01:00
resource.h
SConscript	Move GCMemcard from DolphinWX/Memorycards to Core/HW	2011-10-04 13:14:18 -07:00