From: Vincent <vincent@cubedesigners.com>
Date: Mon, 16 Feb 2026 17:12:08 +0000 (+0100)
Subject: Merge branch 'master' of git.cubedesigners.com:cubedesigners-oxygene
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d3c6d46f6009732d0bd7731f0b8866663fbed226;p=cubedesigners-oxygene.git

Merge branch 'master' of git.cubedesigners.com:cubedesigners-oxygene

# Conflicts:
#	systeme/CONNEXION.$D1
#	systeme/SYSNUMS.$D1
---

d3c6d46f6009732d0bd7731f0b8866663fbed226
diff --cc oxygene.quota
index dcfb7996,4e86b18f..4d086985
--- a/oxygene.quota
+++ b/oxygene.quota
@@@ -1,9 -1,13 +1,13 @@@
  [quotainfo]
  disk=C:\Program Files (x86)\Memsoft Oxygene\oxydev\systeme\bin
  size=63751319552
+ <<<<<<< HEAD
+ avail=2380099584
+ useravail=2380099584
+ =======
  <<<<<<< after-close-2025
 -avail=3655540736
 -useravail=3655540736
 +avail=1098289152
 +useravail=1098289152
  =======
  avail=4175458304
  useravail=4175458304
diff --cc systeme/licences/suscribe.data
index 9a76cde8,3de7c086..ac4b0fb8
--- a/systeme/licences/suscribe.data
+++ b/systeme/licences/suscribe.data
@@@ -1,7 -1,11 +1,11 @@@
  [status]
  <<<<<<< HEAD
+ <<<<<<< HEAD
+ 93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AE80D6D74696A8BE3
+ 130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741
+ =======
  <<<<<<< after-close-2025
 -93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0A71460D34BD760E2A
 +93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0A4E71A385F12AA24A
  130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741
  =======
  93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AA9019B0300E220F9