Merge branch 'openmw-36'

Conflicts: apps/openmw/mwworld/store.hpp
10 years ago · 4fa2cd288d
parent b3ad983f1f e8e3407062
commit 4fa2cd288d
3 changed files with 7 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,8 @@
+0.36.1
+------
+
+    Bug #2590: Start scripts not added correctly
+
 0.36.0
 ------

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -20,7 +20,7 @@ message(STATUS "Configuring OpenMW...")

 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 36)
-set(OPENMW_VERSION_RELEASE 0)
+set(OPENMW_VERSION_RELEASE 1)

 set(OPENMW_VERSION_COMMITHASH "")
 set(OPENMW_VERSION_TAGHASH "")
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@ OpenMW is a recreation of the engine for the popular role-playing game Morrowind

 OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.

-* Version: 0.36.0
+* Version: 0.36.1
 * License: GPL (see docs/license/GPL3.txt for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net