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

diff --cc .gitmodules
index d7283346ae7927fcd3fe8c032c443556a3fd661a,07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,4 -1,4 +1,4 @@@
  [submodule "sdk/argeo-build"]
        path = sdk/argeo-build
--      url = http://git.argeo.org/cc0/argeo-build.git
-       branch = testing
 -      branch = unstable
++      url = https://code.argeo.org/git/cc0/argeo-build.git
++      branch = merge-to-testing

diff --cc .project
Simple merge

diff --cc branch.mk
index 936a67569f072bfad1eeb935aca211a0e0530e86,afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0
--- 1/branch.mk
--- 2/branch.mk
+++ b/branch.mk
@@@ -1,1 -1,1 +1,1 @@@
- include $(SDK_SRC_BASE)/cnf/testing.bnd
 -BRANCH=unstable
++BRANCH=testing

diff --cc sdk/branches/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..22ef9a847c1cb37ee82623127f4ac5a2d36b0248
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=25
++qualifier=.next