diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
| commit | 3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch) | |
| tree | a912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/AndroidManifest.xml | |
| parent | aa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff) | |
| parent | a7454223008c78dcf5e0ff727bca64241f99daa1 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 68aa2148..be7aac5a 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -145,7 +145,7 @@ android:value="eu.siacs.conversations.ui.SettingsActivity" /> </activity> <activity - android:name="de.thedevstack.android.logcat.ui.LogCatOutputActivity" + android:name="de.thedevstack.conversationsplus.ui.LogCatOutputActivity" android:label="@string/title_activity_loginformation" android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" > <meta-data |