mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-27 22:36:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
dolphin-emulator/Source/Core
History
degasus a629dea4dc Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
..
AudioCommon Fix the majority of the compiler warnings unearthed by the addition of 2013-01-29 23:24:51 -06:00
Common Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
Core WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation. 2013-02-17 13:52:04 -06:00
DiscIO Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin. 2013-02-17 01:57:25 -06:00
DolphinWX Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
InputCommon Clean up SDL includes a bit. Maybe fix an SDL2 problem. 2013-02-12 14:02:43 -06:00
VideoCommon Merge branch 'master' into GLSL-master 2013-02-18 18:49:20 +01:00
CMakeLists.txt