Merge branch 'dev' into view_details

CHANGELOG.md

@@ -1,6 +1,6 @@
 # novelWriter ChangeLog
 
-## Version 0.7 [2020-xx-xx]
+## Version 0.7 RC1 [2020-xx-xx]
 
 **User Interface**
 
@@ -16,7 +16,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-05-28]
+## Version 0.6.3 [2020-05-28]
 
 **Bugfixes**
 
@@ -34,6 +34,9 @@
 * Removed the `Xo` icon for NO_LAYOUT in the project tree details panel. Mentioned in #235, PR #239.
 * Added a "Details" tab to the "Project Settings" dialog, which also lists the project path. Issue #242, PR #239.
 
+## Version 0.6.2 [2020-05-28]
+
+* Botched release. Replaced with 0.6.3. Crashes when Build Novel Project is opened.
 
 
 ## Version 0.6.1 [2020-05-25]

docs/source/conf.py

@@ -24,9 +24,9 @@ copyright = "2018-2020, Veronica Berglyd Olsen"
 author = "Veronica Berglyd Olsen"
 
 # The short X.Y version
-version = "0.6.2"
+version = "0.7.0"
 # The full version, including alpha/beta/rc tags
-release = "0.6.2"
+release = "0.7.0rc1"
 
 
 # -- General configuration ---------------------------------------------------

nw/__init__.py

@@ -40,8 +40,8 @@ __package__    = "novelWriter"
 __author__     = "Veronica Berglyd Olsen"
 __copyright__  = "Copyright 2018–2020, Veronica Berglyd Olsen"
 __license__    = "GPLv3"
-__version__    = "0.6.2"
-__hexversion__ = "0x000602f0"
+__version__    = "0.7.0rc1"
+__hexversion__ = "0x000700c1"
 __date__       = "2020-05-28"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"

setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as inFile:
 
 setuptools.setup(
     name = "novelWriter",
-    version = "0.6.2",
+    version = "0.7.0rc1",
     author = "Veronica Berglyd Olsen",
     author_email = "code@vkbo.net",
     description = "A markdown-like document editor for writing novels",