mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 05:38:50 +00:00
Merge branch 'master' into android-core-control
This commit is contained in:
commit
bab91494d5
2008 changed files with 27429 additions and 23764 deletions
|
@ -1,7 +1,7 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/saveStateRoot"
|
||||
android:showAsAction="always"
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/overlay_savestate">
|
||||
<menu>
|
||||
<item android:id="@+id/saveSlot1"
|
||||
|
@ -22,8 +22,8 @@
|
|||
</item>
|
||||
|
||||
<item
|
||||
android:id="@+id/loadtateRoot"
|
||||
android:showAsAction="always"
|
||||
android:id="@+id/loadStateRoot"
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/overlay_loadstate">
|
||||
<menu>
|
||||
<item android:id="@+id/loadSlot1"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue