summaryrefslogtreecommitdiff
path: root/keymanager/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-12-17 16:02:42 -0400
committerKali Kaneko <kali@leap.se>2013-12-17 16:02:42 -0400
commit183253c9a9d2e2cae8467c1c4115d129e9a49d65 (patch)
tree8f3e3d86afabb43cc7211b9f30081474b1142213 /keymanager/src
parentbfd2489f12fbc0d944d43d66ed7f09e0f3881ecc (diff)
parent7e81556f983023e4ba259bc5ef360a940d6ca533 (diff)
Merge remote-tracking branch 'chiiph/bug/versioneer_windows' into develop
Diffstat (limited to 'keymanager/src')
0 files changed, 0 insertions, 0 deletions