push version to 4.3

Author: bhaller

EidosScribe/EidosScribe-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.2</string>
+	<string>3.3</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.2.2</string>
+	<string>3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

QtSLiM/QtSLiM.pro

@@ -21,7 +21,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.2
+VERSION = 4.3
 
 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.2.2</string>
+	<string>4.3</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.2.2</string>
+	<string>4.3</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.3 (Eidos version 3.3):
 	fixed a bug in calcWattersonsTheta(): the value calculated would be incorrect if a window (start/end) was specified
 	added TOC I and TOC II to the PDF index of the SLiM manual; removed the bottom-of-page links section, which made search difficult
 	add subpopulationsWithNames() method to Community, to facilitate being able to use user-defined names for subpops
@@ -34,7 +37,6 @@ development head (in the master branch):
 	add genomicElementForPosition() and hasGenomicElementForPosition() methods on Chromosome
 	policy change: genomicElements property is now in sorted order (not in order of declaration)
 	add a "Copy as HTML" command to copy script with syntax coloring and such
-	
 
 version 4.2.2 (Eidos version 3.2.2):
 	fix SLiMgui crash with code completion

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.2")
-#define SLIM_VERSION_FLOAT	(4.22)
+#define SLIM_VERSION_STRING	("4.3")
+#define SLIM_VERSION_FLOAT	(4.3)
 
 
 // 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.2.2")
-#define EIDOS_VERSION_FLOAT		(3.22)
+#define EIDOS_VERSION_STRING	("3.3")
+#define EIDOS_VERSION_FLOAT		(3.3)
 
 
 #ifdef _OPENMP