Set version number and changelog for v0.15.2

This commit is contained in:
Oliver Hamlet
2020-06-14 10:47:07 +01:00
parent 8abc7160c8
commit 3baa0e88e5
4 changed files with 26 additions and 6 deletions
+20
View File
@@ -2,6 +2,26 @@
Version History
***************
0.15.2 - 2020-06-14
===================
Changed
-------
- :cpp:any:`MergeMetadata()` now only uses the group value of the given metadata
object if there is not already one set, matching the behaviour for all other
merged metadata.
- Updated esplugin to v3.3.1.
- Updated libgit2 to v1.0.1.
- Updated loot-condition-interpreter to v2.1.1.
- Updated spdlog to v1.6.1.
Fixed
-----
- :cpp:any:`GetPluginMetadata()` preferred masterlist metadata over userlist
metadata when merging them, which was the opposite of the intended behaviour.
0.15.1 - 2019-12-07
===================
+1 -1
View File
@@ -121,7 +121,7 @@ Key Merge Behaviour (merging B into A)
=============== ==================================
name Not merged.
enabled Replaced by B's value.
group Replaced by B's value.
group Replaced by B's value only if A has no value set.
after Merged. If B's file set contains an item that is equal to one already present in A's file set, B's item is discarded.
req Merged. If B's file set contains an item that is equal to one already present in A's file set, B's item is discarded.
inc Merged. If B's file set contains an item that is equal to one already present in A's file set, B's item is discarded.
+1 -1
View File
@@ -27,7 +27,7 @@
namespace loot {
const unsigned int LootVersion::major = 0;
const unsigned int LootVersion::minor = 15;
const unsigned int LootVersion::patch = 1;
const unsigned int LootVersion::patch = 2;
const std::string LootVersion::revision = "@GIT_COMMIT_STRING@";
LOOT_API std::string LootVersion::GetVersionString() {
+4 -4
View File
@@ -2,8 +2,8 @@
#include <windows.h>
1 VERSIONINFO
FILEVERSION 0, 15, 1, 0
PRODUCTVERSION 0, 15, 1, 0
FILEVERSION 0, 15, 2, 0
PRODUCTVERSION 0, 15, 2, 0
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -11,9 +11,9 @@ BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileVersion", "0.15.1"
VALUE "FileVersion", "0.15.2"
VALUE "LegalCopyright", "Copyright (C) 2013-2016 WrinklyNinja"
VALUE "ProductVersion", "0.15.1"
VALUE "ProductVersion", "0.15.2"
END
END
BLOCK "VarFileInfo"