Merge branch 'develop' into 'main'

New GDX release 7.11.15

See merge request devel/gdx!106

Author: 0x17

changelog.yaml

@@ -1,4 +1,6 @@
 ---
+- 7.11.15:
+    - Fixed an issue where `gdxmerge` would fail with a "Symbol is too large" error when merging GDX files containing large symbols.
 - 7.11.14:
     - Correctly deal with GDX files that have long absolute paths (>260 characters) in GDX library and all tools (`gdxdump`, `gdxdiff`, `gdxmerge`).
 - 7.11.13:
@@ -54,4 +56,4 @@
     - Removed XCode project file for unit test suite as it is not maintained anymore.
     - >
       Entries for property setters and getters in main header and wrappers are now automatically generated from API
-      definition YAML via Jinja2 templates and not handwritten.
+      definition YAML via Jinja2 templates and not handwritten.

src/tools/gdxmerge/gdxmerge.cpp

@@ -36,8 +36,7 @@
 #include "../../gdlib/strutilx.hpp"
 #include "../../rtl/sysutils_p3.hpp"
 
-// TODO: Disable at some point?
-#define OLD_MEMORY_CHECK
+// #define OLD_MEMORY_CHECK
 
 namespace gdxmerge
 {