diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 14:50:39 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 14:50:39 -0300 |
| commit | 7780685a8beb8fbba54d5c366905d9ece5569008 (patch) | |
| tree | 265a8340cfad6a92a1c2696003221956c81cdfc4 /Makefile | |
| parent | b24fd83c64f2b166a192e9cf7835e5f35a15c1e5 (diff) | |
| parent | c928400ff02adf6c23c5341c2139e95f2c49976d (diff) | |
Merge remote-tracking branch 'ivan/feature/logger_window_rev4' 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 = mainwindow.ui wizard.ui +UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui #Qt resource files to compile -RESOURCES = mainwindow.qrc locale.qrc +RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyside-uic |