dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-23 06:57:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
bff02b3b73
dolphin/Source/Core
History
degasus bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2013-01-09 11:00:26 +01:00
..
AudioCommon (CoreAudio) Retain volume value until initialization. Makes volume slider work when game isn't running. Fixes issue 5383. 2012-12-14 12:15:01 -06:00
Common In memory of calc84. 2012-12-30 16:31:38 +13:00
Core Save git hash to .dtm header. 2013-01-01 16:34:07 -05:00
DiscIO Use do { ... } while (0) for the *_LOG macros 2012-08-20 13:12:49 +02:00
DolphinWX Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
InputCommon Clean up gcc/g++ compiler warnings that have accumulated. 2012-12-10 00:40:28 -06:00
VideoCommon Merge branch 'arb_framebuffer' into GLSL-master 2013-01-09 11:00:26 +01:00
CMakeLists.txt