Merge remote-tracking branch 'origin/main' into v3.3.0-dev
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
EIVE/eive-obsw/pipeline/pr-v3.1.1-branch This commit looks good

This commit is contained in:
Robin Müller 2023-06-21 13:47:46 +02:00
commit 7ceb81f68d
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 4 additions and 4 deletions

View File

@ -18,11 +18,11 @@ will consitute of a breaking change warranting a new major release:
# [v4.0.0] to be released # [v4.0.0] to be released
# [v3.3.0] 2023-06-20 # [v3.3.0] 2023-06-21
Like v3.2.0 but without the custom FM changes related to VC0. Like v3.2.0 but without the custom FM changes related to VC0.
# [v3.2.0] 2023-06-20 # [v3.2.0] 2023-06-21
## Fixed ## Fixed

View File

@ -10,8 +10,8 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR 3) set(OBSW_VERSION_MAJOR 3)
set(OBSW_VERSION_MINOR 1) set(OBSW_VERSION_MINOR 3)
set(OBSW_VERSION_REVISION 1) set(OBSW_VERSION_REVISION 0)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)