aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-04 22:56:33 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-04 22:56:33 +0100
commit39183418ab133f14bddc389dea8419980538f629 (patch)
treeaf4e2af1606c1d87c97382f0281ca7c3777e62e0 /src/main/res/xml
parentff10b094a0a210bb1c7745bd0e0f92e9a7e3ec2d (diff)
parentdf786cbf0114d49974f46433740e5ac89a00d63a (diff)
Merge pull request #616 from SamWhited/license-compliance
License compliance via an "about" menu item
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 06ab7560..15a61e87 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -110,5 +110,8 @@
android:summary="@string/pref_never_send_crash_summary"
android:title="@string/pref_never_send_crash" />
</PreferenceCategory>
+ <eu.siacs.conversations.ui.AboutPreference
+ android:summary="@string/pref_about_conversations_summary"
+ android:title="@string/title_activity_about" />
</PreferenceScreen>