Merge pull request #47 from jomjol/master

Start Rolling v4.0.0
2025-12-09 13:06:54 +03:00 · 2020-11-15 12:57:48 +01:00
parent eae9b66eed c292ecd54b
commit a86aa8034d
5 changed files with 6 additions and 6 deletions
--- a/code/src/version.cpp
+++ b/code/src/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="de772d7";
+const char* GIT_REV="7bfdfd3";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-15 12:29";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-11-15 12:51";
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="de772d7";
+const char* GIT_REV="7bfdfd3";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-15 12:29";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-11-15 12:51";
--- a/firmware/bootloader.bin
+++ b/firmware/bootloader.bin
--- a/firmware/firmware.bin
+++ b/firmware/firmware.bin
--- a/firmware/html.zip
+++ b/firmware/html.zip