diff options
author | toni <toni@devlap.local> | 2014-12-23 21:23:14 +0100 |
---|---|---|
committer | toni <toni@devlap.local> | 2014-12-23 21:23:14 +0100 |
commit | 7653a81207250f8758433cde49b270e5e6cd19e6 (patch) | |
tree | 7c5060ff97df86064f424c11dc30931e252ca291 /debian/compat | |
parent | 580c7a2b483465310164d0928087244ea15d111b (diff) | |
parent | 9cc0432011cda38870e7e8e9b082265ffbe24dbf (diff) |
Merge branch 'master' of github.com:freecoding/naskpass
Conflicts:
ui.c
Diffstat (limited to 'debian/compat')
0 files changed, 0 insertions, 0 deletions