emu-mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-12-30 21:51:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
316a33d1e6
dolphin/Source/Core/DolphinWX
History
degasus 316a33d1e6 Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
..
resources Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00
Src Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
CMakeLists.txt Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Dolphin.vcxproj Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Dolphin.vcxproj.filters remove scons files from VS projects 2012-03-18 06:41:12 -07:00
Dolphin.vcxproj.user vs2010: make -d be passed to debugfast builds launched from vs 2011-02-25 04:00:16 +00:00
DolphinWX.rc Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not. 2012-12-17 08:33:42 -06:00
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 set svn:eol-style=native for **.h 2008-12-08 04:46:09 +00:00