From: Mathieu <mbaudier@argeo.org>
Date: Tue, 21 Feb 2023 11:00:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.22~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=2340c253785ce08144cd3130b85153ad5ff33609;hp=4dc2641a9f7f29d4dd2f7d090c81547fd4bd9a49;p=gpl%2Fargeo-slc.git

Merge remote-tracking branch 'origin/unstable' into testing
---

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb..d7283346a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
 	path = sdk/argeo-build
 	url = http://git.argeo.org/cc0/argeo-build.git
-	branch = unstable
+	branch = testing
diff --git a/branch.mk b/branch.mk
index afde0f838..dbecaaa4b 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index ca2d551c6..a1d5c8e4b 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit ca2d551c67515082032aad2405f30a924468089a
+Subproject commit a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 000000000..0d7ec09ff
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=21
+qualifier=.next