Merge remote-tracking branch 'origin/main' into revise-unknown

ImagingDataCommons · Jan 11, 2025 · cc24366 · cc24366
2 parents c850ee2 + 4e97644
commit cc24366
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## main
 
+## 1.2.0, 11/01/2025
+
 * fix build with uthash \< 2.3.0 [bgilbert]
 * explicitly fail if macOS universal build is attempted [bgilbert]
 * better handling of implicit mode in dcm-dump [jcupitt]

diff --git a/meson.build b/meson.build
@@ -10,7 +10,7 @@ project(
   ],
   license : 'MIT',
   meson_version : '>=0.50',
-  version : '1.1.0'
+  version : '1.2.0'
 )
 if not meson.is_subproject()
   meson.add_dist_script(
@@ -36,7 +36,7 @@ endif
 #   2. Backward-compatible ABI change: bump minor, reset patch
 #   3. Other, eg. bugfix: bump patch
 abi_version_major = 1
-abi_version_minor = 1
+abi_version_minor = 2
 abi_version_patch = 0
 
 abi_version = '@0@.@1@.@2@'.format(