diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /OpenKeychain/src/main/res/layout/help_activity.xml | |
parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/layout/help_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/help_activity.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 76ba183b7..3ad087da3 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - <org.sufficientlysecure.keychain.util.SlidingTabLayout + <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/sliding_tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" /> |