aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-301-4/+3
|\
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-4/+3
* | split import and export opsAdithya Abraham Philip2015-06-271-2/+1
|/
* Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-261-0/+2
|\
| * Import R and BuildConfig explicitlyThialfihar2015-06-261-0/+2
| * Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-1119-0/+5517
| |\
* | \ Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-1119-0/+5529
|\ \ \ | |/ / |/| / | |/
| * Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
| * Fix debug/release build separationDominik Schürmann2015-06-1113-13/+26
| * Use new officially supported way for local unit tests, many dependencies upgr...Dominik Schürmann2015-06-1118-0/+5490
|/
* update unit test support in build filesVincent Breitmoser2014-05-272-69/+0
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-062-0/+69