Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-12 21:46:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
dolphin/Source/Android/res
History
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. 2013-10-01 09:53:47 -04:00
drawable-xxhdpi [Android] Add xxhdpi versions of the file icon and the folder icon used in the folder browser. 2013-10-01 10:05:17 -04:00
layout Merge branch 'master' into android-new-control-input-overlay 2013-11-24 16:12:00 -06:00
menu Merge branch 'master' into android-new-control-input-overlay 2013-11-24 16:12:00 -06:00
values Merge branch 'master' into android-new-control-input-overlay 2013-11-24 16:12:00 -06:00
values-ja Merge branch 'master' into android-new-control-input-overlay 2013-11-24 16:12:00 -06:00
xml [Android] Basic Wiimote binding settings now implemented. 2013-11-19 19:28:10 -05:00