Commit 872d5cb3 authored by Clément Fauconnier's avatar Clément Fauconnier

Merge branch 'uat' into dev

parents df301d00 c69d63b2
...@@ -11,8 +11,8 @@ CONFIG += debug_and_release \ ...@@ -11,8 +11,8 @@ CONFIG += debug_and_release \
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 5 VERSION_MIN = 5
VERSION_PATCH = 4 VERSION_PATCH = 4
VERSION_TYPE = rc # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error
VERSION_BUILD = 2 VERSION_BUILD = 0
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment