mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
This commit is contained in:
Ryan Houdek 2013-11-29 21:27:17 -06:00
commit 7bdd8191db
31 changed files with 218 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Android/res/values/strings.xml
View file

@ -29,6 +29,7 @@
<!-- Game List Activity - Device Compatibility AlertDialog -->
<string name="device_compat_warning">Device Compatibility Warning</string>
<string name="device_compat_warning_msg">Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway?</string>
<string name="device_gles3compat_warning_msg">Your device has known buggy video drivers for OpenGL ES 3.\nDo you want to try anyway?</string>
<!-- Game List Fragment -->
<string name="file_clicked">File clicked: %1$s</string>