Merge pull request #96 from jomjol/master

Rolling to v6.1.0

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="3869da9";
+const char* GIT_REV="46cfe45";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-01-20 19:24";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-01-20 19:47";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="3869da9";
+const char* GIT_REV="46cfe45";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-01-20 19:24";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-01-20 19:47";