Merge pull request #102 from micro-manager/mmcore-11-1-1

Upgrade MMCore to 11.1.1
micro-manager · Dec 1, 2023 · 6012247 · 6012247
2 parents 34a179c + 46b620c
commit 6012247
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mmCoreAndDevices b/mmCoreAndDevices
diff --git a/pymmcore/_version.py b/pymmcore/_version.py
@@ -1 +1 @@
-__version__ = "11.0.0.71.1.dev0"
+__version__ = "11.1.1.71.0.dev0"
+1 −1		DeviceAdapters/ZeissCAN/mcu28.cpp
+140 −0		MMCore/CoreFeatures.cpp
+44 −0		MMCore/CoreFeatures.h
+31 −12		MMCore/Devices/DeviceInstance.cpp
+52 −1		MMCore/MMCore.cpp
+6 −0		MMCore/MMCore.h
+2 −0		MMCore/MMCore.vcxproj
+6 −0		MMCore/MMCore.vcxproj.filters
+2 −0		MMCore/Makefile.am
+1 −1		MMCoreJ_wrap/pom.xml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "11.0.0.71.1.dev0"
		__version__ = "11.1.1.71.0.dev0"