Skip to content

Commit

Permalink
Merge branch 'LABDOS01A' of github.com:UniversalScientificTechnologie…
Browse files Browse the repository at this point in the history
…s/LABDOS01 into LABDOS01A
  • Loading branch information
roman-dvorak committed Apr 20, 2023
2 parents ed5a81c + 976044c commit 6817f17
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 2,675 deletions.
2 changes: 1 addition & 1 deletion fw/LABDOS/githash.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is overwritten by github actions, do not update it manually
String githash = "88248711eed87ad11c579b364f9d8979e0fdf22a,User";
String githash = "73e623ea183e866381c243da276f04b76dd1652d,User";
#define GHRELEASE 0
#define GHBUILD 0
#define GHBUILDTYPE User
2 changes: 1 addition & 1 deletion fw/LABDOS/nextversion
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
MAJOR 7
MINOR 2
RELEASE 0
BUILD 116
BUILD 117
2 changes: 1 addition & 1 deletion fw/UAVDOS/githash.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is overwritten by github actions, do not update it manually
String githash = "88248711eed87ad11c579b364f9d8979e0fdf22a,User";
String githash = "73e623ea183e866381c243da276f04b76dd1652d,User";
#define GHRELEASE 3
#define GHBUILD 0
#define GHBUILDTYPE User
2 changes: 1 addition & 1 deletion fw/UAVDOS/nextversion
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
MAJOR 0
MINOR 1
RELEASE 3
BUILD 20
BUILD 21
Loading

0 comments on commit 6817f17

Please sign in to comment.