From 6106dda2a3bffb0e3ca8850bf8bda3abbad4cb26 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 25 Nov 2016 14:31:56 +0100
Subject: [PATCH] bump version, update changelog

---
 CHANGELOG.md                              | 3 +++
 app/build.gradle                          | 4 ++--
 app/src/main/res/xml/changelog_master.xml | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc3878f45..2382d1ed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 0.14.2
+* Pebble 2: Fix a bug where the Pebble got disconnected by other unrelated LE devices
+
 ####Version 0.14.1
 * Mi Band 2: Initial experimental support for activity data
 * Mi Band 2: Send the fitness goal (steps) to the band
diff --git a/app/build.gradle b/app/build.gradle
index e8fa2193c..7d3500a79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.14.1"
-        versionCode 73
+        versionName "0.14.2"
+        versionCode 74
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 28d67e490..50ad1d7e6 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.14.2" versioncode="74">
+        <change>Pebble 2: Fix a bug where the Pebble got disconnected by other unrelated LE devices
+    </release>
     <release version="0.14.1" versioncode="73">
         <change>Mi Band 2: Initial experimental support for activity data</change>
         <change>Mi Band 2: Send the fitness goal (steps) to the band</change>