Merge pull request #176 from jomjol/master

Sync Rolling

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9923be2";
+const char* GIT_REV="21a70c5";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-04-05 10:04";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-04-05 10:14";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9923be2";
+const char* GIT_REV="21a70c5";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-04-05 10:04";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-04-05 10:14";