Ryan Houdek 8d8b0fc884 Merge branch 'master' into buffer_storage ... Conflicts: Source/Core/VideoBackends/OGL/Src/Render.cpp Source/Core/VideoCommon/Src/DriverDetails.cpp Source/Core/VideoCommon/Src/DriverDetails.h		2013-12-31 15:41:50 -06:00
..
AudioCommon	Minor const-correctness for some functions in FifoPlayer and some AudioCommon headers.	2013-12-11 08:43:58 -05:00
Common	Add a non-tiny warning about CPUs that will silently desync.	2013-12-16 22:41:52 -05:00
Core	[ARM] Implement tw/twi	2013-12-28 04:43:07 -06:00
DiscIO	fixed issue 6852.	2013-12-07 16:07:47 +09:00
DolphinWX	Support grabbing whichever OpenGL mode we are running under from GLInterface. GLES or GL	2013-12-28 00:58:08 -06:00
InputCommon	[Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound.	2013-12-12 21:24:39 -06:00
VideoBackends	Merge branch 'master' into buffer_storage	2013-12-31 15:41:50 -06:00
VideoCommon	Merge branch 'master' into buffer_storage	2013-12-31 15:41:50 -06:00
CMakeLists.txt	Put Plugins/ in Core/, rename to VideoBackends	2013-10-07 10:37:01 -04:00