Merge pull request #69 from jomjol/master

Sync rolling master to v4.1.1
2025-12-11 14:07:00 +03:00 · 2020-12-02 21:58:42 +01:00
parent c9c02daff7 2ae304dcf5
commit c5059b4568
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="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";
--- a/code/version.cpp
+++ b/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";
--- a/firmware/bootloader.bin
+++ b/firmware/bootloader.bin
--- a/firmware/firmware.bin
+++ b/firmware/firmware.bin
--- a/firmware/html.zip
+++ b/firmware/html.zip