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
..
ControllerInterface	Merge branch 'master' into android-new-control-input-overlay	2013-11-24 16:12:00 -06:00
ControllerEmu.cpp	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
ControllerEmu.h	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
GCPadStatus.h	Remove some unnecessary includes as well as simplifying exisiting ones if possible.	2013-10-19 19:58:56 -04:00
InputConfig.cpp	Overlay local gameinis over global gameinis instead of copying.	2013-09-14 17:46:41 +02:00
InputConfig.h	Remove some unnecessary includes as well as simplifying exisiting ones if possible.	2013-10-19 19:58:56 -04:00
stdafx.cpp	Update to VS2013 and a slew of build-related updates. Notes:	2013-10-26 17:55:38 -07:00
stdafx.h	Update to VS2013 and a slew of build-related updates. Notes:	2013-10-26 17:55:38 -07:00
UDPWiimote.cpp	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
UDPWiimote.h	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
UDPWrapper.cpp	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
UDPWrapper.h
X11InputBase.cpp	Run code through the advanced tool 'sed' to remove trailing whitespace.	2013-11-03 20:54:05 -05:00
X11InputBase.h