Merge branch 'cpp-11' into save_ext

2019-01-13 23:30:52 +00:00
parent 0dba091d79 d86aa7719b
commit 4a162c5502
144 changed files with 1021 additions and 328 deletions
--- a/findversion.sh
+++ b/findversion.sh
@@ -74,8 +74,6 @@ if [ -d "$ROOT_DIR/.git" ]; then

 	if [ -n "$TAG" ]; then
 		VERSION="${TAG}"
-	elif [ "${BRANCH}" = "master" ]; then
-		VERSION="${ISODATE}-g${SHORTHASH}"
 	else
 		VERSION="${ISODATE}-${BRANCH}-g${SHORTHASH}"
 	fi