From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 06:49:29 +0000 (+0100)
Subject: Merge tag 'v2.3.10' into testing
X-Git-Tag: v2.1.6~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=5d6d48735e6db0917e5b520e660ab251deb9d442;hp=ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c;p=cc0%2Fargeo-build.git

Merge tag 'v2.3.10' into testing
---

diff --git a/branch.mk b/branch.mk
index c040e63..02caedb 100644
--- 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 0328fd5..891f8f8 100644
--- 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
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