increment version to 4.2.2

MesserLab · May 5, 2024 · 834f9b8 · 834f9b8
1 parent 5a1d519
commit 834f9b8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/EidosScribe/EidosScribe-Info.plist b/EidosScribe/EidosScribe-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/EidosScribe/EidosScribe_multi-Info.plist b/EidosScribe/EidosScribe_multi-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QtSLiM/QtSLiM.pro b/QtSLiM/QtSLiM.pro
@@ -18,7 +18,7 @@ QMAKE_INFO_PLIST = QtSLiM_Info.plist
 ICON = QtSLiM_AppIcon.icns
 QMAKE_TARGET_BUNDLE_PREFIX = "org.messerlab"
 QMAKE_BUNDLE = "SLiMgui"		# This governs the location of our prefs, which we keep under org.messerlab.SLiMgui
-VERSION = 4.2.1
+VERSION = 4.2.2
 
 docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns
 docIconFiles.path = Contents/Resources

diff --git a/SLiMgui/SLiMguiLegacy-Info.plist b/SLiMgui/SLiMguiLegacy-Info.plist
@@ -88,7 +88,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.1</string>
+	<string>4.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/SLiMgui/SLiMguiLegacy_multi-Info.plist b/SLiMgui/SLiMguiLegacy_multi-Info.plist
@@ -88,7 +88,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.1</string>
+	<string>4.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/VERSIONS b/VERSIONS
@@ -6,9 +6,11 @@ Note that not every commit will be logged here; that is what the Github commit h
 
 
 development head (in the master branch):
+
+
+version 4.2.2 (Eidos version 3.2.2):
 	fix SLiMgui crash with code completion
 	fix spurious VCF reading error (number of calls not equal to number of samples) due to incorrect usage of eof()
-
 
 version 4.2.1 (Eidos version 3.2.1):
 	fix an issue in Linux release/installer builds with FORTIFY_SOURCE=3 (resulting in a "buffer overflow" error in self-test and in treeSeqOutput())

diff --git a/core/slim_globals.h b/core/slim_globals.h
@@ -44,8 +44,8 @@ class SLiMEidosBlock;
 
 
 // SLiM version: see also Info.plist and QtSLiM.pro
-#define SLIM_VERSION_STRING	("4.2.1")
-#define SLIM_VERSION_FLOAT	(4.21)
+#define SLIM_VERSION_STRING	("4.2.2")
+#define SLIM_VERSION_FLOAT	(4.22)
 
 
 // This should be called once at startup to give SLiM an opportunity to initialize static state

diff --git a/eidos/eidos_globals.h b/eidos/eidos_globals.h
@@ -52,8 +52,8 @@ class EidosToken;
 
 
 // Eidos version: See also Info.plist
-#define EIDOS_VERSION_STRING	("3.2.1")
-#define EIDOS_VERSION_FLOAT		(3.21)
+#define EIDOS_VERSION_STRING	("3.2.2")
+#define EIDOS_VERSION_FLOAT		(3.22)
 
 
 #ifdef _OPENMP