diff options
| author | toni <matzeton@googlemail.com> | 2014-12-22 15:31:11 +0100 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2014-12-22 15:31:11 +0100 |
| commit | 2bb3dfdc0138a924b88a8a8529b4c01b43ae1add (patch) | |
| tree | 29a81f1dd24c2b41b9bd67896fb731d4cdf8966f /ui.c | |
| parent | b50b0ed59c59b6c09f03b7a299281c46f0ee57ad (diff) | |
| parent | 20ecfc0d21eb2dacf35ce3af3185c022fc4b8bc4 (diff) | |
Merge branch 'master' of github.com:lnslbrty/naskpass
Conflicts:
main.c
Diffstat (limited to 'ui.c')
0 files changed, 0 insertions, 0 deletions