aboutsummaryrefslogtreecommitdiffstats
path: root/gradlew
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-07-18 09:47:24 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-07-18 09:47:24 +0200
commitd8ada7c1bb39e9eb93c8de5534dfe443b6f53c82 (patch)
tree19c5a60504e8c2f7488f66d32c5dc3e617ae55fc /gradlew
parent69c38c3f340786fd3e3fe755d2cff6bbb27823e6 (diff)
parent306bea5ee95576cd5428fe9ab9289fe428a86c6e (diff)
downloadopen-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.gz
open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.bz2
open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.zip
Merge branch 'master' into yubikey
Conflicts: .gitmodules
Diffstat (limited to 'gradlew')
0 files changed, 0 insertions, 0 deletions