diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-04 21:32:37 +0200 |
| commit | cae0071342e746c934490298c3dd3ee230a2ee32 (patch) | |
| tree | 5c540d7c8ad84b462fd3cbc87b0aea7c5513fc9c /DESIGN.mkd | |
| parent | 6a637462782b4ce57ecf154edf0974114181b8ad (diff) | |
| parent | 52f1f30846ad7efa6e6ae11ed96f5b68626bfb3b (diff) | |
| download | open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.gz open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.tar.bz2 open-keychain-cae0071342e746c934490298c3dd3ee230a2ee32.zip | |
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'DESIGN.mkd')
| -rw-r--r-- | DESIGN.mkd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/DESIGN.mkd b/DESIGN.mkd index f1a800cba..342f567a9 100644 --- a/DESIGN.mkd +++ b/DESIGN.mkd @@ -1,6 +1,7 @@ # Design Notes on Open-Keychain -This document contains notes on the software design of open keychain. +This document contains notes on the software design of open keychain. Points +with a * are yet to be implemented. ## Database design |