diff options
| author | Kali Kaneko <kali@leap.se> | 2014-06-10 09:29:16 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-06-10 09:29:16 -0500 |
| commit | 049f8bce340f10e4d61e393a53ba72436b9c3e1c (patch) | |
| tree | 10f63eac59cf7621de71777ff4644901b020cf77 /Makefile | |
| parent | a1b8dec4352caec64f250ffb9738cd605ccab0ad (diff) | |
| parent | c621fa7322b4f8151eb37b27f8aeae563cf6bd63 (diff) | |
Merge tag '0.5.2' into deb-0.5.2
Tag leap.bitmask version 0.5.2
Conflicts:
docs/man/bitmask-root.1.rst
docs/man/bitmask.1.rst
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ PROJFILE = data/bitmask.pro #UI files to compile UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui #Qt resource files to compile -RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc +RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc eipstatus.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyside-uic |