diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-23 11:27:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-23 11:27:26 -0300 |
| commit | 2ecf4dd80ecae9aaa416a5567d9ad102482fc4e5 (patch) | |
| tree | 8320eb9e98e1122ed1441cfeb27ecea6e07a60dd /Makefile | |
| parent | 0b449949cc31f25cd17ff2bdf2d9b0539499f8f8 (diff) | |
| parent | 7d10092df85a91db5e40b0eb36d4bb2cc67f6d05 (diff) | |
Merge remote-tracking branch 'ivan/feature/2796_create-preferences-panel' 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 statuspanel.ui +UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui preferences.ui #Qt resource files to compile RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc |