aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-30 11:20:35 +0100
committeriNPUTmice <daniel@gultsch.de>2014-10-30 11:20:35 +0100
commitf2c1a80059af89caeb299a5cc02c401da6b4b138 (patch)
treec868409a94abdee41313e4509c8625701bfdd4ff /AndroidManifest.xml
parent15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (diff)
parent7b4f3637db8c99d84fe3c825d583bfc0fa91fada (diff)
Merge branch 'development'
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml11
1 files changed, 4 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ce4ea5df..a66de8ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,9 @@
<?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" >
+ android:versionCode="32"
+ android:versionName="0.8-alpha" >
<uses-sdk
android:minSdkVersion="14"
@@ -22,14 +23,10 @@
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" />
- <provider
- android:name="eu.siacs.conversations.services.ImageProvider"
- android:authorities="eu.siacs.conversations.images"
- android:exported="true" />
-
<receiver android:name="eu.siacs.conversations.services.EventReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />