diff options
| author | toni <matzeton@googlemail.com> | 2014-12-17 22:42:35 +0100 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2014-12-17 22:42:35 +0100 |
| commit | 030d5b619e5192a132bc473912c3f80b74da4bf9 (patch) | |
| tree | 5304a6b126e1192fd3ecaf23cb54e4254a4a6b27 | |
| parent | 86f401fbd47e59aea421f7063a146b7c8ae95c03 (diff) | |
| parent | cb4ef70bef863b6f791755bacfc4f8f9339f3c2b (diff) | |
Merge branch 'master' of github.com:lnslbrty/naskpass
Conflicts:
ui_statusbar.c
0 files changed, 0 insertions, 0 deletions