Skip to content
GitLab
Commit f5277e5e authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'develop' into 'hotfix-gui_issues_plotter_and_user_definition_viewer' 

# Conflicts:
#   CHANGELOG
#   MDANSE/__pkginfo__.py
parents f4780fb9 5d93406d
Pipeline #4077 passed with stages
in 15 minutes and 14 seconds
Hide whitespace changes
Inline Side-by-side
CHANGELOG
View file @ f5277e5e
version 1.2.0
--------------
version 1.1.3
--------------
* FIXED issue #17 The plotter crashed when user was clicking on "plot in new window"
......
MDANSE/__pkginfo__.py
View file @ f5277e5e
......@@ -25,7 +25,7 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/"
__license__ = "GPL 3"
__version__ = "1.1.3"
__version__ = "1.2.0"
__date__ = "27-06-2018"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment