change version to 4.2 in anticipation of release

EidosScribe/EidosScribe-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

EidosScribe/EidosScribe_multi-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

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.1
+VERSION = 4.2
 
 docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns
 docIconFiles.path = Contents/Resources

SLiMgui/SLiMguiLegacy-Info.plist

@@ -88,7 +88,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

SLiMgui/SLiMguiLegacy_multi-Info.plist

@@ -88,7 +88,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1</string>
+	<string>4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

VERSIONS

@@ -6,6 +6,9 @@ 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 (Eidos version 3.2):
 	fix for #418, a crash involving null genomes in nonWF (has_null_genomes_ was not set correctly by addCloned() or takeMigrants() when putting a null genome into a subpop that previously had none)
 	big changes to Eidos under the hood - removal of the singleton/vector distinction and EidosValue subclasses, add constness flag, differentiate casting vs. non-casting accesses, etc.
 	policy change: float indices are no longer legal for subsetting, indices must be integer (or a logical vector, as usual); this was inherited from R and is a bad idea for Eidos
@@ -43,7 +46,6 @@ development head (in the master branch):
 	add estimatedLastTick() method to Community; useful for custom plotting where you want to know the span of the model up front, to set an axis range, for example
 	adjusted recipe 5.3.1 to use zero-based subpopulation ids, simplifying the logic; the workshop uses this recipe and it was a common source of confusion
 
-
 version 4.1 (Eidos version 3.1):
 	fix a minor bug with autofix when opening multiple .slim documents at once in SLiMgui
 	fix recipe 17.10 to set the time unit, to avoid the timescale warning from tskit

core/slim_globals.h

@@ -44,8 +44,8 @@ class SLiMEidosBlock;
 
 
 // SLiM version: see also Info.plist and QtSLiM.pro
-#define SLIM_VERSION_STRING	("4.1")
-#define SLIM_VERSION_FLOAT	(4.1)
+#define SLIM_VERSION_STRING	("4.2")
+#define SLIM_VERSION_FLOAT	(4.2)
 
 
 // This should be called once at startup to give SLiM an opportunity to initialize static state

eidos/eidos_globals.h

@@ -52,8 +52,8 @@ class EidosToken;
 
 
 // Eidos version: See also Info.plist
-#define EIDOS_VERSION_STRING	("3.1")
-#define EIDOS_VERSION_FLOAT		(3.1)
+#define EIDOS_VERSION_STRING	("3.2")
+#define EIDOS_VERSION_FLOAT		(3.2)
 
 
 #ifdef _OPENMP