dolphin/Externals
Pierre Bourdon fdff4cb1ff Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
2012-05-16 09:27:37 +02:00
..
Bochs_disasm Remove scons-related files 2012-03-25 12:55:02 -07:00
Cg Revert r7078. 2011-06-13 11:17:36 +00:00
Cg64 Revert r7078. 2011-06-13 11:17:36 +00:00
CLRun Remove scons-related files 2012-03-25 12:55:02 -07:00
gettext
GLew Remove scons-related files 2012-03-25 12:55:02 -07: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
LZO Remove scons-related files 2012-03-25 12:55:02 -07:00
openssl openssl: fix linker warning by adding those pesky pdb files. 2012-02-27 00:54:11 -08:00
portaudio oops, forgot to disable WDMKS on portaudio 32bit build 2012-03-19 03:40:21 -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 Remove scons-related files 2012-03-25 12:55:02 -07:00
wxWidgets3 Remove scons-related files 2012-03-25 12:55:02 -07:00
zlib Remove scons-related files 2012-03-25 12:55:02 -07:00