diff options
| author | toni <toni@devlap.local> | 2015-10-20 15:29:35 +0200 |
|---|---|---|
| committer | toni <toni@devlap.local> | 2015-10-21 22:29:56 +0200 |
| commit | 2a8181d2b1fcfec32ff0ea19facb5620c58a8f66 (patch) | |
| tree | ddf1b49acbb6738bed2e34134a19afe6eeaa0b83 /debian/control | |
| parent | 60f9330c35085d067a1c491714d7de49d2120b76 (diff) | |
| parent | 94559d68556e1fe22211bc19c23dafe80ecb15f5 (diff) | |
Merge branch 'master' of e35.ddns.net:/home/git/naskpass
Conflicts:
ui_nwindow.c
Diffstat (limited to 'debian/control')
0 files changed, 0 insertions, 0 deletions