Vincent Breitmoser 0b16a4edfd Merge remote-tracking branch 'origin/master' ... Conflicts: OpenKeychain/src/main/AndroidManifest.xml		2014-09-29 21:32:21 +02:00
..
src/main	Merge remote-tracking branch 'origin/master'	2014-09-29 21:32:21 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate	2014-09-24 02:01:53 +02:00