diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
| commit | 7bdd8191dbbde1324d2848fc256be820bc437fa2 (patch) | |
| tree | b2f8e22e2f85264bb3d6fa9af826fc1653c1a5f5 /Source/Core/InputCommon | |
| parent | 00a25cdaf5379a5ea3879ad7743cce47c9f44d65 (diff) | |
| parent | 69137cff4c58fbdfcb2b67ad51d2d68cc8ca0cbc (diff) | |
Merge branch 'master' into android-new-control-input-overlay
Conflicts:
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Diffstat (limited to 'Source/Core/InputCommon')
0 files changed, 0 insertions, 0 deletions