dolphin

mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00

History

degasus a1c5e90083 Merge branch 'master' into GLSL-master

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp

2013-03-06 15:59:29 +01:00

Bochs_disasm

Remove scons-related files

2012-03-25 12:55:02 -07:00

CLRun

Update CLRun to have OCL 1.2

2013-02-23 01:47:37 -05:00

gettext

Build mo translation files on all platforms. Had to import msgfmt executable in the Externals to do this on windows.

2011-01-10 19:26:36 +00:00

GLew

update to glew1.9, win binaries also from official release