diff options
| author | toni <matzeton@googlemail.com> | 2014-12-20 00:48:44 +0100 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2014-12-20 00:48:44 +0100 |
| commit | 2068721e457f0d2c941e690776837b22e384e9be (patch) | |
| tree | 88b2b9a0c9ea385cec03efdcdac98e35b950d760 /ui_statusbar.h | |
| parent | 2011ed7c238a4d740f5ccd50fd084e0f07b03560 (diff) | |
| parent | 030d5b619e5192a132bc473912c3f80b74da4bf9 (diff) | |
Merge branch 'master' of github.com:lnslbrty/naskpass
Conflicts:
ui_statusbar.c
Diffstat (limited to 'ui_statusbar.h')
0 files changed, 0 insertions, 0 deletions