Merge pull request #166 from jomjol/master

Sync Rolling

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="c6ae989";
+const char* GIT_REV="7bc4e63";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-03-25 20:40";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-03-25 20:52";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="c6ae989";
+const char* GIT_REV="7bc4e63";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-03-25 20:40";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-03-25 20:52";