Manually merge changeset e1ea0f6a5a50, explicitly specifying app name. ICAL4J_EMBED_1

Sat, 14 Feb 2015 01:57:28 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 14 Feb 2015 01:57:28 +0100
branch
ICAL4J_EMBED_1
changeset 24
b9b0fbab11a4
parent 22
e8c0da59391a
child 25
831fc533ed9e

Manually merge changeset e1ea0f6a5a50, explicitly specifying app name.

AndroidManifest.xml file | annotate | diff | comparison | revisions
     1.1 --- a/AndroidManifest.xml	Sat Feb 14 00:30:34 2015 +0100
     1.2 +++ b/AndroidManifest.xml	Sat Feb 14 01:57:28 2015 +0100
     1.3 @@ -17,6 +17,7 @@
     1.4          android:allowBackup="true"
     1.5          android:icon="@drawable/ic_launcher"
     1.6          android:label="@string/app_name"
     1.7 +        android:name="com.europalab.Caldavsync"
     1.8          android:theme="@style/AppTheme" >
     1.9          <service
    1.10              android:name="org.gege.caldavsyncadapter.syncadapter.SyncService"
    1.11 @@ -52,4 +53,4 @@
    1.12          </activity>
    1.13      </application>
    1.14  
    1.15 -</manifest>
    1.16 \ No newline at end of file
    1.17 +</manifest>

mercurial