aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Rename multi certify files to certifyDominik Schürmann2014-10-261-4/+3
|
* Fix notify after certifyDominik Schürmann2014-10-261-3/+3
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-231-10/+8
| | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
* Externalize QR Code scanning and import into its own activity for better ↵Dominik Schürmann2014-10-231-0/+223
code separation