merged master

This commit is contained in:
Aditya Kulkarni
2018-10-26 10:22:03 -07:00
11 changed files with 246 additions and 13 deletions

View File

@@ -76,6 +76,7 @@ FORMS += \
src/confirm.ui \
src/turnstile.ui \
src/turnstileprogress.ui
src/memodialog.ui
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin