Vincent Breitmoser 30d0afa363 change the way merging is logged

2014-10-25 02:45:16 +02:00

..

src/main

change the way merging is logged

2014-10-25 02:45:16 +02:00

.gitignore

…

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