Preparing the release of version 1.2

smeerten · Dec 6, 2019 · efc9f66 · efc9f66
1 parent 9d3a400
commit efc9f66
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-## [1.2] - 2019-??-??
+## [1.2] - 2019-12-06
 ### Added
 - New plot type: 2D Colour Plot
 - Added experimental support for Bruker ParaVision imaging data

diff --git a/DocSrc/Title.tex b/DocSrc/Title.tex
@@ -27,7 +27,7 @@
 \large Wouter Franssen \& Bas van Meerten
 
 \vspace{1cm}
-\large Version 1.2b
+\large Version 1.2
 \vfill
 \includegraphics[width=0.5\textwidth]{Images/logo.pdf}\
 

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Contributing
 ------------
 
 1. Fork it
-2. Create your feature branch
+2. Create your feature branch (preferably based on the develop branch)
 3. Commit your changes
 4. Push to the branch
 5. Submit a pull request

diff --git a/ReferenceManual.pdf b/ReferenceManual.pdf
diff --git a/Tutorial/Tutorial.pdf b/Tutorial/Tutorial.pdf
diff --git a/Tutorial/src/Title.tex b/Tutorial/src/Title.tex
@@ -27,7 +27,7 @@
 \large Wouter Franssen \& Bas van Meerten
 
 \vspace{1cm}
-\large Version 1.2b
+\large Version 1.2
 \vfill
 \includegraphics[width=0.7\textwidth]{Images/logo.pdf}\
 

diff --git a/src/ssNake.py b/src/ssNake.py
@@ -105,7 +105,7 @@ def import_lib(name, nameAs, className, splashStep):
 np.set_printoptions(threshold=sys.maxsize)
 QtCore.QLocale.setDefault(QtCore.QLocale('en_US'))
 
-VERSION = 'v1.2b'
+VERSION = 'v1.2'
 # Required library version
 NPVERSION = '1.11.0'
 MPLVERSION = '1.5.0'