diff options
| author | toni <matzeton@googlemail.com> | 2014-12-15 02:18:42 +0100 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2014-12-17 22:41:21 +0100 |
| commit | 86f401fbd47e59aea421f7063a146b7c8ae95c03 (patch) | |
| tree | 5304a6b126e1192fd3ecaf23cb54e4254a4a6b27 /status.c | |
| parent | 32154ede9cf6d2055617a4cb62534b02841ecf5b (diff) | |
| parent | c6ca9fac6fddbbcca316b6d7925b4e596da074f5 (diff) | |
Merge branch 'master' of github.com:lnslbrty/naskpass
Conflicts:
ui_statusbar.c
Diffstat (limited to 'status.c')
0 files changed, 0 insertions, 0 deletions