ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Externals
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
..
Bochs_disasm Remove scons-related files 2012-03-25 12:55:02 -07:00
CLRun Remove scons-related files 2012-03-25 12:55:02 -07:00
GLew Remove scons-related files 2012-03-25 12:55:02 -07:00
LZO Remove scons-related files 2012-03-25 12:55:02 -07:00
SDL Remove scons-related files 2012-03-25 12:55:02 -07:00
SFML Remove scons-related files 2012-03-25 12:55:02 -07:00
SOIL Warning free SOIL lib. 2012-12-23 19:24:57 +13: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
libjpeg update libjpeg to 8c 2011-02-05 04:47:16 +00:00
libpng Remove scons-related files 2012-03-25 12:55:02 -07:00
portaudio oops, forgot to disable WDMKS on portaudio 32bit build 2012-03-19 03:40:21 -07:00
wxWidgets3 Fix OS X 10.6 compatibility. 2012-12-07 19:49:08 +01:00
zlib Remove scons-related files 2012-03-25 12:55:02 -07:00