diff options
| author | kali <kali@leap.se> | 2013-06-14 04:15:49 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-06-14 04:15:49 +0900 |
| commit | b72db47a15b07843a82c8d5dbe762d5278d9af07 (patch) | |
| tree | 203a1fbef5673cd1343f84974e90f7b5fa038573 /Makefile | |
| parent | 93db3e9da1347f239eba937120c6f7fb05eaab0a (diff) | |
| parent | cfd60d6e47a351e1ce52709a497e5a0b03319dcf (diff) | |
Merge remote-tracking branch 'chiiph/feature/refactor_status' into develop
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -20,9 +20,9 @@ TRANSLAT_DIR = data/translations PROJFILE = data/leap_client.pro #UI files to compile -UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui +UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui #Qt resource files to compile -RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc +RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyside-uic |