From 0cd4a299912ec74d35226025ead5f262c146229e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Tue, 27 Jun 2017 14:40:14 +0200
Subject: [PATCH] Bumped version to 1.0.2 and updated NEWS file

---
 NEWS.md              | 13 +++++++++++++
 src/tiled/Info.plist |  6 +++---
 tiled.pri            |  2 +-
 tiled.qbs            |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index abff4679cb..5762bf3f05 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,16 @@
+### 1.0.2 (27 June 2017)
+
+* Added read-only tile and terrain properties in map editor
+* Fixed Terrains view to display all tilesets with terrain
+* Fixed hang when trying to fill with a pasted stamp (#1617, #1624)
+* Fixed crash when editing collision when tile image wasn't loaded
+* Fixed rendering of tile objects when the image couldn't be loaded
+* Fixed rendering of tile object outlines for resized objects
+* Fixed labels shown on objects hidden via a group layer
+* Fixed updating of label positions when moving a group layer
+* GmxPlugin: Fixed tile type inheritance for tile objects
+* Restored Ctrl+N shortcut on "New Map" action
+
 ### 1.0.1 (13 June 2017)
 
 * Made the zoom level used in Tilesets view persistent
diff --git a/src/tiled/Info.plist b/src/tiled/Info.plist
index aff18fc38f..f85a7305c8 100644
--- a/src/tiled/Info.plist
+++ b/src/tiled/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Tiled</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Tiled 1.0.1, Copyright 2008-2017 Thorbjørn Lindeijer, GNU General Public License</string>
+	<string>Tiled 1.0.2, Copyright 2008-2017 Thorbjørn Lindeijer, GNU General Public License</string>
 	<key>CFBundleIconFile</key>
 	<string>tiled-icon-mac</string>
 	<key>CFBundleIdentifier</key>
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
diff --git a/tiled.pri b/tiled.pri
index 1203be4690..8cea8aecf7 100644
--- a/tiled.pri
+++ b/tiled.pri
@@ -1,5 +1,5 @@
 # Initialize the version
-isEmpty(TILED_VERSION):TILED_VERSION = "1.0.1"
+isEmpty(TILED_VERSION):TILED_VERSION = "1.0.2"
 
 # See the README file for instructions about setting the install prefix.
 isEmpty(PREFIX):PREFIX = /usr/local
diff --git a/tiled.qbs b/tiled.qbs
index 5ea688ec9f..36323ecc24 100644
--- a/tiled.qbs
+++ b/tiled.qbs
@@ -7,7 +7,7 @@ Project {
     qbsSearchPaths: "qbs"
     minimumQbsVersion: "1.6"
 
-    property string version: Environment.getEnv("TILED_VERSION") || "1.0.1";
+    property string version: Environment.getEnv("TILED_VERSION") || "1.0.2";
     property bool sparkleEnabled: Environment.getEnv("TILED_SPARKLE")
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT")
     property bool release: Environment.getEnv("TILED_RELEASE")