Merge branch 'master' into dev

This commit is contained in:
Veronica K. B. Olsen
2020-05-28 19:50:47 +02:00
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
* Dropped the usage of .bak copies of document files. This was the old method to ensure the document data was written successfully, but it uses twice the storage space. Instead, writing via a temp file is the safe way to save files. PR #248.
## Version 0.6.2 [2020-xx-xx]
## Version 0.6.2 [2020-05-28]
**Bugfixes**
+2 -2
View File
@@ -24,9 +24,9 @@ copyright = "2018-2020, Veronica Berglyd Olsen"
author = "Veronica Berglyd Olsen"
# The short X.Y version
version = "0.6.1"
version = "0.6.2"
# The full version, including alpha/beta/rc tags
release = "0.6.1"
release = "0.6.2"
# -- General configuration ---------------------------------------------------
+3 -3
View File
@@ -40,9 +40,9 @@ __package__ = "novelWriter"
__author__ = "Veronica Berglyd Olsen"
__copyright__ = "Copyright 20182020, Veronica Berglyd Olsen"
__license__ = "GPLv3"
__version__ = "0.6.1"
__hexversion__ = "0x000601f0"
__date__ = "2020-05-25"
__version__ = "0.6.2"
__hexversion__ = "0x000602f0"
__date__ = "2020-05-28"
__maintainer__ = "Veronica Berglyd Olsen"
__email__ = "code@vkbo.net"
__status__ = "Pre-Release"
+1 -1
View File
@@ -6,7 +6,7 @@ with open("README.md", "r") as inFile:
setuptools.setup(
name = "novelWriter",
version = "0.6.1",
version = "0.6.2",
author = "Veronica Berglyd Olsen",
author_email = "code@vkbo.net",
description = "A markdown-like document editor for writing novels",