diff options
author | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
commit | 5d573b4f10109811b1ec7d277dfb15c548f00530 (patch) | |
tree | 3de86f0c027a29f7dfb2dac94e3d7f9251f1018b /Makefile | |
parent | 5111539437aa98660e72a19e2468b3e3fac44942 (diff) | |
parent | 584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff) |
Merge tag '0.3.4' into debian
Tag leap.bitmask version 0.3.4
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -19,7 +19,7 @@ TRANSLAT_DIR = data/translations PROJFILE = data/bitmask.pro #UI files to compile -UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui preferences.ui +UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui #Qt resource files to compile RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc |