Merge branch 'master' into android-core-control

This commit is contained in:
Ryan Houdek
2013-09-23 00:47:57 -05:00
2008 changed files with 27429 additions and 23764 deletions

View File

@ -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"