Merge tag 'v2.3.10' into testing

diff --git a/branch.mk b/branch.mk
index c040e634e6d422cbc46c793693d89cfcec27f6b3..02caedb7cd800e5933d8bf8f2162673de81c7ed5 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1,3 +1,3 @@
 # WARNING: this Makefile is for Argeo Build to build itself
 # and is not meant to be included or used in regular builds
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file

diff --git a/common.mk b/common.mk
index 0328fd5fa56b8fdc1f1900660ca3bd5b8a040e3a..891f8f8d99347247cd9242a00138f1c060142298 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,5 @@
 build-major=2
-build-minor=3
+build-minor=1
 
 # Required third party libraries
 ECJ_MAJOR=3

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644 (file)
index 0000000..e8a57b2
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,6 @@
+major=2
+minor=1
+micro=5
+qualifier=.next
+
+SPDX-License-Identifier=CC0-1.0
\ No newline at end of file