Merge pull request #69 from jomjol/master

Sync rolling master to v4.1.1

code/src/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="f6f3e23";
+const char* GIT_REV="ffc15aa";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-12-02 21:50";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-12-02 21:56";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="f6f3e23";
+const char* GIT_REV="ffc15aa";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-12-02 21:50";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-12-02 21:55";