From e02f9c1d609444eabd331d37408ee2dfe15bd16b Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 4 Mar 2016 07:08:07 -0500
Subject: [PATCH 1/2] Bump version to 1.2.0

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6cf90a811..80f2bbd0d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="8"
-    android:versionName="1.1.1">
+    android:versionCode="9"
+    android:versionName="1.2.0">
 
     <uses-permission
         android:name="android.permission.VIBRATE"/>

From 382a2fe6000da12e335fcefb328087385a70c094 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 4 Mar 2016 12:21:45 -0500
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..31acf8f74
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+### 1.2.0 (March 4, 2016)
+
+* Ability to export habit data as CSV
+* Widgets (checkmark, history, score and streaks)
+* More natural scrolling on data views (fling)
+* Minor UI improvements on pre-Lollipop devices
+* Fix crash on Samsung Galaxy TabS 8.4
+* Other minor bug fixes
+
+### 1.1.1 (February 24, 2016)
+
+* Show reminder only on chosen days of the week
+* Rearrange habits by long-pressing then dragging
+* Select and modify multiple habits simultaneously
+* 12/24 hour format according to phone preferences
+* Permanently delete habits
+* Usage hints during startup
+* Translation to Brazilian Portuguese and Chinese
+* Other minor fixes
+
+### 1.0.0 (February 19, 2016)
+
+* Initial release
\ No newline at end of file