diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /dists/android | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'dists/android')
| -rw-r--r-- | dists/android/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml.in | 1 | ||||
| -rw-r--r-- | dists/android/README.Android | 1 | ||||
| -rwxr-xr-x | dists/android/mkplugin.sh | 1 | ||||
| -rw-r--r-- | dists/android/plugin-manifest.xml | 1 | ||||
| -rw-r--r-- | dists/android/plugin-manifest.xml.in | 1 | ||||
| -rw-r--r-- | dists/android/plugin-strings.xml | 1 | ||||
| -rw-r--r-- | dists/android/res/layout/main.xml | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 1bc784cc4c..e540e4e8b9 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -58,4 +58,3 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> </manifest> - diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index a8d40bdddc..e9ab30a42b 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -58,4 +58,3 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> </manifest> - diff --git a/dists/android/README.Android b/dists/android/README.Android index 550b73bdfa..7fa8c08371 100644 --- a/dists/android/README.Android +++ b/dists/android/README.Android @@ -53,4 +53,3 @@ CONTROLS Menu button: ScummVM menu Menu button held for 0.5s: Toggle virtual keyboard Camera or Search button: Right mouse button click - diff --git a/dists/android/mkplugin.sh b/dists/android/mkplugin.sh index f4643132cf..1811fc0475 100755 --- a/dists/android/mkplugin.sh +++ b/dists/android/mkplugin.sh @@ -14,4 +14,3 @@ TARGET=$5 PLUGIN_DESC=`sed -n s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p` < $CONFIGURE sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET - diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml index 3fd9e393d0..2fbd56b367 100644 --- a/dists/android/plugin-manifest.xml +++ b/dists/android/plugin-manifest.xml @@ -32,4 +32,3 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> </manifest> - diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in index c941b2f48c..47db078c93 100644 --- a/dists/android/plugin-manifest.xml.in +++ b/dists/android/plugin-manifest.xml.in @@ -32,4 +32,3 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> </manifest> - diff --git a/dists/android/plugin-strings.xml b/dists/android/plugin-strings.xml index 363503f8d8..ade37e0aca 100644 --- a/dists/android/plugin-strings.xml +++ b/dists/android/plugin-strings.xml @@ -4,4 +4,3 @@ <string name="app_name">ScummVM plugin: "@PLUGIN_NAME@"</string> <string name="app_desc">Game engine for: @PLUGIN_DESC@</string> </resources> - diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml index b6164edc96..7b633c416d 100644 --- a/dists/android/res/layout/main.xml +++ b/dists/android/res/layout/main.xml @@ -10,4 +10,3 @@ android:focusable="true" android:focusableInTouchMode="true" /> - |