Merge branch 'develop' into 'material'

# Conflicts:
#   .appveyor.yml
square-messages
Black Hat 2019-02-03 04:21:50 +00:00
commit 7454dbc9d0
1 changed files with 1 additions and 1 deletions

View File

@ -17,7 +17,7 @@ before_build:
- git submodule update --init --recursive
build_script:
- qmake spectral.pro CONFIG+=release CONFIG+=qtquickcompiler BUNDLE_FONT=true PREFIX="%DEPLOY_DIR%"
- qmake spectral.pro CONFIG+=release CONFIG+=qtquickcompiler PREFIX="%DEPLOY_DIR%"
- nmake
after_build: