diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:01:45 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:01:45 +0200 |
| commit | 30648a835dfcf20f430abde5e29205fb437e3915 (patch) | |
| tree | d4d862d04994f48c9a79cbef1d93fc745af5b12e /AndroidManifest.xml | |
| parent | 75392614917aae2cd2414cf8ba5d2f81ca81a9be (diff) | |
| parent | 5c2a79361a937b076bfd33b52d6c3230cc295a3d (diff) | |
Merge pull request #555 from SamWhited/build-fixes
Fix problem when merging manifests during a Gradle build
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3263cdd62..d65f747e0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" package="eu.siacs.conversations" android:versionCode="31" android:versionName="0.7.3" > @@ -22,6 +23,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" + tools:replace="android:label" android:theme="@style/ConversationsTheme" > <service android:name="eu.siacs.conversations.services.XmppConnectionService" /> |