From aef80dfb9c31c6bfb530f4c39ec9dead97c92bb4 Mon Sep 17 00:00:00 2001
From: liabru <liabru@brm.io>
Date: Tue, 31 Mar 2015 22:03:59 +0100
Subject: [PATCH] release 0.6.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 README.md    |  2 +-
 bower.json   |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86f5de..8f3c185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,25 @@
 
 ----------
 
+## 0.6.0
+
+- added options parameter
+- added `property` option
+- added `target` option
+- added callback events
+- added maintain scroll
+- added inline-block support
+- added hidden elements support
+- improved performance and throttling
+- improved demo
+
+- fixed declaration order issue when using requirejs
+- fixed issues for people using build concatenation
+- fixed data api issue with missing data-mh
+- fixed IE8 border calculation
+- fixed Safari row detection
+- fixed inline style preservation
+
 ## 0.5.2
 
 - improved demo
diff --git a/README.md b/README.md
index fa5f0f1..27c3883 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ See the [jquery.matchHeight.js demo](http://brm.io/jquery-match-height-demo).
 
 ### Status
 
-Current version is `v0.5.2`. <br>
+Current version is `v0.6.0`. <br>
 Use the master build for the latest features. <br>
 Please report any [issues](https://github.com/liabru/jquery-match-height/issues) you find.
 
diff --git a/bower.json b/bower.json
index e5d6cb4..589795e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "matchHeight",
-    "version": "0.5.2",
+    "version": "0.6.0",
     "homepage": "https://github.com/liabru/jquery-match-height",
     "authors": [
         "Liam Brummitt <liam@brm.io> (http://brm.io/)"