Merge branch 'master' into android-new-control-input-overlay

Browse Source

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

...

This commit is contained in:

Ryan Houdek

2013-11-24 16:12:00 -06:00

parent f6f2b1fc60 f292819ff5

commit ba18f38e70

154 changed files with 1743 additions and 1079 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Source/Android/res/layout/gamelist_folderbrowser_list.xml → Source/Android/res/layout/gamelist_folderbrowser_list_item.xml