increment version to 3.6 (Eidos 2.6)

MesserLab · Mar 3, 2021 · 978622e · 978622e
1 parent 34eff16
commit 978622e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/EidosScribe/Info.plist b/EidosScribe/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5</string>
+	<string>2.6</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 = 3.5
+VERSION = 3.6
 
 docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns
 docIconFiles.path = Contents/Resources

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

diff --git a/VERSIONS b/VERSIONS
@@ -8,6 +8,9 @@ The build numbers given here are visible in SLiMgui's about panel.  They are not
 
 
 development head:
+
+
+version 3.6 (build 2784; Eidos version 2.6):
 	update to JSON for Modern C++ version 3.9.1
 	add metadata= parameter to treeSeqOutput(), to support user-generated metadata on the tree sequence
 	make ampersands show up in the Jump menu properly in SLiMgui
@@ -50,7 +53,6 @@ development head:
 	extend Dictionary() constructor to allow it to be passed key-value pairs to set, or a Dictionary to copy
 	extend Dictionary with an identicalContents() method to test for equality of Dictionary objects (containing the identical keys and values)
 
-
 version 3.5 (build 2663; Eidos version 2.5):
 	added build instructions for Windows WSL, thanks to Bernard Kim (no code change)
 	fix some issues with recipes 13.5 and 14.8 (involving live plotting in R) with platform-dependent paths, lack of PDF viewing support in QtSLiM, etc.

diff --git a/core/slim_globals.h b/core/slim_globals.h
@@ -40,8 +40,8 @@ class Subpopulation;
 class SLiMEidosBlock;
 
 
-#define SLIM_VERSION_STRING	("3.5")
-#define SLIM_VERSION_FLOAT	(3.5)
+#define SLIM_VERSION_STRING	("3.6")
+#define SLIM_VERSION_FLOAT	(3.6)
 
 
 // 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
@@ -53,8 +53,8 @@ class EidosScript;
 class EidosToken;
 
 
-#define EIDOS_VERSION_STRING	("2.5")
-#define EIDOS_VERSION_FLOAT		(2.5)
+#define EIDOS_VERSION_STRING	("2.6")
+#define EIDOS_VERSION_FLOAT		(2.6)
 
 
 // These should be called once at startup to give Eidos an opportunity to initialize static state