cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,065 Commits 1 Branch 0 Tags
9d7779072995fb35c18a719f79c8465828b33ce3
Commit Graph
5 Commits
Author SHA1 Message Date
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser 97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
mar-v-in 36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
Dominik Schürmann ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00