Merge pull request #224 from jomjol/master

sync rolling

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="b34bd5d";
+const char* GIT_REV="b7e6d33";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-13 08:11";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-05-13 08:18";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="b34bd5d";
+const char* GIT_REV="b7e6d33";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-13 08:11";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-05-13 08:18";