Merge remote-tracking branch 'upstream/main' into 76-sharding-in-zarr

acquire-project · Sep 22, 2023 · e950f06 · e950f06
2 parents 45429fb + 8b41fff
commit e950f06
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/acquire-core-libs b/src/acquire-core-libs
diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common
diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime
+0 −1		CMakeLists.txt
+0 −30		cmake/git-versioning.cmake
+1 −0		src/acquire-core-logger/CMakeLists.txt
+1 −1		src/acquire-core-platform/linux/CMakeLists.txt
+15 −2		src/acquire-core-platform/linux/platform.c
+1 −1		src/acquire-core-platform/osx/CMakeLists.txt
+7 −3		src/acquire-core-platform/osx/platform.c
+1 −1		src/acquire-core-platform/win32/CMakeLists.txt
+1 −1		src/acquire-core-platform/win32/platform.c
+1 −1		tests/CMakeLists.txt
+85 −0		tests/file-create-behavior.cpp
+9 −4		cmake/git-versioning.cmake
+1 −0		src/CMakeLists.txt
+1 −1		src/acquire-core-libs