From b2bae26d7dd42331af6261064d3183ae017cafaf Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 19 Jun 2016 11:58:13 +0200
Subject: [PATCH] bump version, update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebd0ff297..a73f51392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 ####Version 0.10.2
 * Pebble: allow to manually paste configuration data for legacy configuration pages
 * Pebble: various improvements to the configuration page
+* Pebble: Suppport FW 4.0-dp1 and Pebble2 emulator (needs recompilation of Gadgetbridge)
+* Pebble: Fix a problem with key events when using the Pebble music player
 
 ####Version 0.10.1
 * Pebble: set extended music info by dissecting notifications on Android 5.0+
diff --git a/app/build.gradle b/app/build.gradle
index 9cfc069a2..e4c2ac782 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.10.1"
-        versionCode 54
+        versionName "0.10.2"
+        versionCode 55
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 089322bed..31efd8ece 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release
-        version="0.10.2"
-        versioncode="55">
-        <change>Pebble: allow to manually paste configuration data for legacy configuration pages
-        </change>
+    <release version="0.10.2" versioncode="55">
+        <change>Pebble: allow to manually paste configuration data for legacy configuration pages</change>
         <change>Pebble: various improvements to the configuration page</change>
+        <change>Pebble: Suppport FW 4.0-dp1 and Pebble2 emulator (needs recompilation of Gadgetbridge)</change>
+        <change>Pebble: Fix a problem with key events when using the Pebble music player</change>
     </release>
     <release version="0.10.1" versioncode="54">
         <change>Pebble: set extended music info by dissecting notifications on Android 5.0+</change>