Changeset 3e9f39e in galcon-client for AndroidManifest.xml

Timestamp:

May 28, 2010, 12:47:31 AM (15 years ago)

Author:

Zero Cool <devnull@…>

Branches:

master

Children:

1291908

Parents:

1a91f0d (diff), 8a4e64f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with a30e7e8b565e27d0defe9bba05b1e60e10906df6

File:

• AndroidManifest.xml (modified) (1 diff)

AndroidManifest.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.helloandroid"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".HelloAndroid"
-                  android:label="@string/app_name">
+    package="com.example.helloandroid">
+    <application android:icon="@drawable/app_lunar_lander" android:label="@string/app_name">
+        <activity android:name="Game">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-
+                </activity>
     </application>
     <uses-sdk android:minSdkVersion="7" />
-
-</manifest> 
+</manifest>