cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
881a50207af0a9f9f5aa69f451110de786779b54
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
History
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
..
compatibility
Update license header for 2014
2014-04-13 17:27:22 +02:00
helper
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
keyimport
Optimize imports
2014-08-05 22:46:00 +02:00
pgp
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
provider
Optimize imports
2014-08-05 22:46:00 +02:00
remote
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
service
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
ui
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
util
Use CompressionAlgorithmTags instead of homebrew constants
2014-08-05 23:50:59 +02:00
Constants.java
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00
KeychainApplication.java
Use CompressionAlgorithmTags instead of homebrew constants
2014-08-05 23:50:59 +02:00