Ryan Houdek 37b67971e7 Merge remote-tracking branch 'origin/master' into Android-trash ... Conflicts: Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp		2013-04-14 20:43:42 -05:00
..
AudioCommon	Some more logging typos and clarifications. Missed these in my last commit.	2013-04-01 00:10:54 -04:00
Common	Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp	2013-04-14 20:39:56 -05:00
Core	Merge remote-tracking branch 'origin/master' into Android-trash	2013-04-14 20:43:42 -05:00
DiscIO	ChunkFile has allowed me to accidentally "Do" a non-POD for the last time!	2013-04-09 19:02:22 -05:00
DolphinWX	Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp	2013-04-14 20:39:56 -05:00
InputCommon	Clean up some space/tab mismatches in DiscIO and InputCommon.	2013-03-19 09:59:41 -04:00
VideoCommon	Good job Windows. Stop choosing the same names as I do.	2013-04-13 00:54:11 -05:00
CMakeLists.txt	Merge UI related projects into the main DolphinWX project.	2011-02-11 21:37:52 +00:00