aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-4/+4
|\
| * fix a couple remaining AppMsgsVincent Breitmoser2014-07-291-4/+4
* | Create key with fragmentsDominik Schürmann2014-07-301-2/+2
|/
* Redesigned QR Code viewDominik Schürmann2014-07-271-0/+114