diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
commit | d2893b4ad78a573bb0cdc001530d40b6c5f7dd01 (patch) | |
tree | b2454ae8a7df84b1a2be50ac94bb2247f57f684c /Makefile | |
parent | 65eff7efadec6a88d3f55bbd3f6448f3dd5e7641 (diff) | |
parent | 07600853819d65959e9e2c9b96d62578442d3ae0 (diff) |
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ TRANSLAT_DIR = data/translations 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 +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 |