Merge branch 'release-1.2.x'

CHANGELOG

+version 1.2.1
+--------------
+* FIXED issue #39 Time scale in Gromacs converter was incorrect
+
 version 1.2.0
 --------------
 * ADDED issue #27 Better error handling when an error occurs when running an analysis from the GUI

Src/Framework/Jobs/Gromacs.py

@@ -109,7 +109,7 @@ class GromacsConverter(Converter):
             self._universe.foldCoordinatesIntoBox()
                                                    
         # The current time.
-        t = times[0]*Units.fs
+        t = times[0]*Units.ps
 
         # Store a snapshot of the current configuration in the output trajectory.
         self._snapshot(data={'time': t})

Src/__pkginfo__.py

@@ -25,9 +25,9 @@ __repo__             = "https://code.ill.fr/scientific-software/mdanse/"
 
 __license__          = "GPL 3"
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
-__date__ = "18-09-2018"
+__date__ = "21-09-2018"
 
 __commit__ = "undefined"