diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
| commit | a0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch) | |
| tree | 9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/AndroidManifest.xml | |
| parent | 6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff) | |
| parent | 9efc13983516c4c37540eb9544f8fa411ded81c7 (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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 4f9c050d..68aa2148 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -144,6 +144,14 @@ android:name="android.support.PARENT_ACTIVITY" android:value="eu.siacs.conversations.ui.SettingsActivity" /> </activity> + <activity + android:name="de.thedevstack.android.logcat.ui.LogCatOutputActivity" + android:label="@string/title_activity_loginformation" + android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" > + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="de.thedevstack.conversationsplus.ui.SettingsActivity" /> + </activity> </application> </manifest> |