diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-24 16:12:00 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-24 16:12:00 -0600 |
| commit | ba18f38e7016900417b9d34944f8111211be4430 (patch) | |
| tree | e96a2f508f840b20f8da4802f5cef6d347e5d92e /Source/Core/InputCommon/ControllerInterface/Android | |
| parent | f6f2b1fc60067b19068f2d0edbbfbfe5e73a0806 (diff) | |
| parent | f292819ff5d9017094c8d2debca2e4a93add448c (diff) | |
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
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Android')
0 files changed, 0 insertions, 0 deletions