aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-02 23:02:10 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-02 23:02:10 +0100
commita0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch)
tree9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/res/xml
parent6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff)
parent9efc13983516c4c37540eb9544f8fa411ded81c7 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/preferences.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index e36b3e8b..20ceb634 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -214,6 +214,9 @@
android:key="keep_foreground_service"
android:title="@string/pref_keep_foreground_service"
android:summary="@string/pref_keep_foreground_service_summary" />
+ <de.thedevstack.conversationsplus.ui.preferences.LogInformationPreference
+ android:summary="@string/pref_show_logcat_summary"
+ android:title="@string/pref_show_logcat_title"/>
</PreferenceCategory>
</PreferenceScreen>