Skip to content

Commit b87ce8c

Browse files
committed
Merge branch 'master' into rolling
2 parents f8478d7 + e372c87 commit b87ce8c

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

code/main/version.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="4fe9ab9";
1+
const char* GIT_REV="a3d6923";
22
const char* GIT_TAG="";
33
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-11-14 08:39";
4+
const char* BUILD_TIME="2021-11-14 08:49";

code/main/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C"
1313
#include "Helper.h"
1414
#include <fstream>
1515

16-
const char* GIT_BASE_BRANCH = "master - v9.0.0 - 2021-10-23";
16+
const char* GIT_BASE_BRANCH = "master - v9.1.0 - 2021-11-14";
1717

1818

1919
const char* git_base_branch(void)

code/version.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="4fe9ab9";
1+
const char* GIT_REV="a3d6923";
22
const char* GIT_TAG="";
33
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-11-14 08:39";
4+
const char* BUILD_TIME="2021-11-14 08:49";

firmware/bootloader.bin

0 Bytes
Binary file not shown.

firmware/firmware.bin

-32 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)