From 517b636743ddb828e9e631e3eeaaf92d2a3f8fa7 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Sat, 22 Dec 2018 23:51:01 +0000
Subject: [PATCH] Update versions and changelog for v1.2.0

---
 CHANGELOG.md   | 14 ++++++++++++++
 Cargo.toml     |  2 +-
 ffi/Cargo.toml |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4860cf2..27e2158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.2.0] - 2018-12-22
+
+### Added
+
+- Support for parsing version strings that match the regular expression
+  `\d+, \d+, \d+, \d+`.
+
+### Changed
+
+- An executable's product version is now read from the `ProductVersion` field in
+  the executable's `VS_VERSIONINFO` structure, not from the product version
+  fields in the `VS_FIXEDFILEINFO` structure. This is so that the version read
+  matches the version displayed by Windows' File Explorer.
+
 ## [1.1.1] - 2018-11-14
 
 ### Fixed
diff --git a/Cargo.toml b/Cargo.toml
index e3c6fef..2af4789 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "loot-condition-interpreter"
-version = "1.1.1"
+version = "1.2.0"
 authors = ["Oliver Hamlet <oliver.hamlet@gmail.com>"]
 license = "MIT"
 
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index 2bc8ae2..0069410 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "loot-condition-interpreter-ffi"
-version = "1.1.1"
+version = "1.2.0"
 authors = ["Oliver Hamlet <oliver.hamlet@gmail.com>"]
 license = "MIT"
 build = "build.rs"