Merge branch 'develop' into dev-express-alarm

This commit is contained in:
Bastian Schroll 2017-10-03 19:18:37 +02:00 committed by GitHub
commit 03cd002cfe
6 changed files with 66 additions and 6 deletions

View file

@ -9,8 +9,9 @@ Global variables
"""
# version info
versionNr = "2.2.2-dev"
buildDate = "in dev"
versionNr = "2.2.2"
branch = "dev"
buildDate = "unreleased"
# Global variables

View file

@ -31,6 +31,7 @@ def printHeader(args):
print " by Bastian Schroll, Jens Herrmann "
print ""
print "SW Version: "+globalVars.versionNr
print "Branch: "+globalVars.branch
print "Build Date: "+globalVars.buildDate
print ""