diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-06 02:24:34 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-06 02:24:34 +0200 |
| commit | fdf6411d5f059a2cde6bb32841895d5bf501ebe8 (patch) | |
| tree | de8f6434ad00dd2a688160204aa5762b49f14b99 /settings.gradle | |
| parent | 1b0666e9de5caea14997a3e638a6209b45c97d60 (diff) | |
| parent | 3363507be48e6ee77341fc8d637528610dc5136f (diff) | |
| download | open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.gz open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.tar.bz2 open-keychain-fdf6411d5f059a2cde6bb32841895d5bf501ebe8.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/res/layout/encrypt_content.xml
Diffstat (limited to 'settings.gradle')
0 files changed, 0 insertions, 0 deletions