Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Android/res/values-ja/strings.xml Source/Android/res/values/strings.xml Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java		2013-11-24 16:12:00 -06:00
..
Android	[Android-overlay] Support multiple gamepads with touch screen controls.	2013-11-24 15:04:53 -06:00
DInput	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
OSX	Run code through clang-modernize -loop-convert to create range-based for loops, and manually fix some stuff up.	2013-11-03 20:54:01 -05:00
SDL	more warning fixes	2013-11-14 02:19:15 -05:00
XInput	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
Xlib	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
ControllerInterface.cpp	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
ControllerInterface.h	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
Device.cpp
Device.h
ExpressionParser.cpp	Run code through clang-modernize -add-override to add 'override' decls.	2013-11-03 20:54:05 -05:00
ExpressionParser.h