From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 1 Jun 2023 06:09:57 +0000 (+0200)
Subject: Merge tag 'v2.3.6' into testing
X-Git-Tag: v2.1.2~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=13abf513d6d3da1495eb4e4a6024504060a93cde;p=cc0%2Fargeo-build.git

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

13abf513d6d3da1495eb4e4a6024504060a93cde
diff --cc branch.mk
index 0000000,c040e63..02caedb
mode 000000,100644..100644
--- a/branch.mk
+++ b/branch.mk
@@@ -1,0 -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
++BRANCH=testing
diff --cc sdk/branches/testing.bnd
index 0000000,0000000..955fa7d
new file mode 100644
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,6 @@@
++major=2
++minor=1
++micro=1
++qualifier=
++
++SPDX-License-Identifier=CC0-1.0