dolphin

Files

T

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

drawable

Make sure to add our resources for the joystick.

2013-11-14 15:20:44 -06:00

drawable-hdpi

[Android] Add correct density-sized images of the navigation drawer icon. Now all icons are density-specific.

2013-10-01 09:53:47 -04:00

drawable-mdpi

[Android] Add correct density-sized images of the navigation drawer icon. Now all icons are density-specific.

2013-10-01 09:53:47 -04:00

drawable-xhdpi

[Android] Add correct density-sized images of the navigation drawer icon. Now all icons are density-specific.