Merge branch 'release-2.0.2'

aalto-speech · Aug 30, 2017 · 6c8d162 · 6c8d162
2 parents ba88de8 + cf061cf
commit 6c8d162
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014, Sami Virpioja and Peter Smit
+Copyright (c) 2012-2017, Sami Virpioja, Peter Smit, and Stig-Arne Grönroos.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -48,7 +48,7 @@
 
 # General information about the project.
 project = u'Morfessor'
-copyright = u'2013, Sami Virpioja and Peter Smit'
+copyright = u'2017, Sami Virpioja, Peter Smit, and Stig-Arne Grönroos'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.1'
+release = '2.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/license.rst b/docs/source/license.rst
@@ -1,6 +1,6 @@
 License
 =======
-Copyright (c) 2012-2013, Sami Virpioja and Peter Smit.
+Copyright (c) 2012-2017, Sami Virpioja, Peter Smit, and Stig-Arne Grönroos.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/morfessor/__init__.py b/morfessor/__init__.py
@@ -9,8 +9,8 @@
            'BaselineModel', 'main', 'get_default_argparser', 'main_evaluation',
            'get_evaluation_argparser']
 
-__version__ = '2.0.2alpha4'
-__author__ = 'Sami Virpioja, Peter Smit'
+__version__ = '2.0.2'
+__author__ = 'Sami Virpioja, Peter Smit, Stig-Arne Grönroos'
 __author_email__ = "morpho@aalto.fi"
 
 show_progress_bar = True

diff --git a/morfessor/cmd.py b/morfessor/cmd.py
@@ -35,7 +35,7 @@ def get_default_argparser():
         description="""
 Morfessor %s
 
-Copyright (c) 2012-2014, Sami Virpioja and Peter Smit
+Copyright (c) 2012-2017, Sami Virpioja, Peter Smit, and Stig-Arne Grönroos.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without