diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 01:51:30 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 01:51:30 +0100 |
| commit | 64e85a2eb4d1c43c3cabc47c8e9fb5c40b0fada0 (patch) | |
| tree | 1bd04e1eeff403c0bdd5012698f02e1ac1dc60d6 /OpenKeychain/src/main/res/layout/certify_key_fragment.xml | |
| parent | b74fa6c662ae050b4259eeef6c47cfa07a8cca0f (diff) | |
| parent | 301200197926cc4b951b08aec79f632774d764ed (diff) | |
| download | open-keychain-64e85a2eb4d1c43c3cabc47c8e9fb5c40b0fada0.tar.gz open-keychain-64e85a2eb4d1c43c3cabc47c8e9fb5c40b0fada0.tar.bz2 open-keychain-64e85a2eb4d1c43c3cabc47c8e9fb5c40b0fada0.zip | |
Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card
Conflicts:
Graphics/get-material-icons.sh
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/layout/certify_key_fragment.xml')
0 files changed, 0 insertions, 0 deletions