ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Android/res/values-ja
History
Ryan Houdek 7bdd8191db Merge branch 'master' into android-new-control-input-overlay 
Conflicts:
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
 		2013-11-29 21:27:17 -06:00
..
strings.xml Merge branch 'master' into android-new-control-input-overlay 2013-11-29 21:27:17 -06:00