Merge tag 'v2.3.6' into testing

diff --cc branch.mk
index 0000000000000000000000000000000000000000,c040e634e6d422cbc46c793693d89cfcec27f6b3..02caedb7cd800e5933d8bf8f2162673de81c7ed5
mode 000000,100644..100644
--- /dev/null
--- 2/branch.mk
+++ b/branch.mk
@@@ -1,0 -1,3 +1,3 @@@
 -BRANCH=unstable
+ # WARNING: this Makefile is for Argeo Build to build itself
+ # and is not meant to be included or used in regular builds
++BRANCH=testing

diff --cc sdk/branches/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..955fa7d8a76955940b62d2c16a183c5aa14ec829
new file mode 100644 (file)
--- /dev/null
--- /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