From 96bed5ef1a8184b0ce7347f23bceea54b0c15fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 26 Oct 2015 19:58:56 +0100
Subject: Update zxing-android-embedded with new custom activity

---
 OpenKeychain/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 3cac4ed10..8730a456e 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -499,7 +499,8 @@
                 <data android:mimeType="application/pgp-keys" />
             </intent-filter>
         </activity>
-
+        <activity
+            android:name=".ui.QrCodeCaptureActivity"/>
         <activity
             android:name=".ui.ImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-- 
cgit v1.2.3