From e95a04c2bc287a69098188d1d3a3ec1e6d75b36f Mon Sep 17 00:00:00 2001 From: Todd Fleming Date: Fri, 28 Jan 2022 13:57:36 -0500 Subject: [PATCH 1/2] Bump version to v3.0.0-rc1 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dedf14021e..147fd3f8b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ set( CMAKE_CXX_STANDARD 17 ) set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) -set(VERSION_MAJOR 2) +set(VERSION_MAJOR 3) set(VERSION_MINOR 0) -set(VERSION_PATCH 13) -#set(VERSION_SUFFIX rc3) +set(VERSION_PATCH 0) +set(VERSION_SUFFIX rc1) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}") From 0b4882052d108b274edd324c020b9214d58b9b87 Mon Sep 17 00:00:00 2001 From: Todd Fleming Date: Fri, 28 Jan 2022 14:04:06 -0500 Subject: [PATCH 2/2] readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e41b3da54..2ad9eee65e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ ## Repo organization -Current development is on the `main` branch. There aren't any releases yet; they'll eventually be on release branches. +| branch | description | +| ------ | ----------- | +| `main` | Development for future releases | +| `release/3.0.x` | 3.0.x-* series of releases | ## Supported Operating Systems