Ryan Houdek 2a23bdde6f Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Core/DolphinWX/Src/Android/ButtonManager.h		2013-11-13 16:17:42 -06:00
..
ButtonManager.cpp	Merge branch 'master' into android-new-control-input-overlay	2013-11-13 16:17:42 -06:00
ButtonManager.h	Merge branch 'master' into android-new-control-input-overlay	2013-11-13 16:17:42 -06:00
TextureLoader.cpp	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
TextureLoader.h	[Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really.	2013-09-02 01:40:05 -05:00