From 50de6641bdf4d53958c616a9e32049d0da9f7e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20K=C3=A1rolyi?= <laszlo@karolyi.hu>
Date: Thu, 15 May 2014 11:37:20 +0200
Subject: [PATCH] Updated CHANGELOG, version bump to 0.2.6

---
 .jsbeautifierrc | 3 ++-
 CHANGELOG.md    | 8 ++++++++
 package.json    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.jsbeautifierrc b/.jsbeautifierrc
index a6129b7..507cb2a 100644
--- a/.jsbeautifierrc
+++ b/.jsbeautifierrc
@@ -4,5 +4,6 @@
   "indent_level": 0,
   "indent_with_tabs": false,
   "preserve_newlines": true,
-  "max_preserve_newlines": 2
+  "max_preserve_newlines": 2,
+  "jslint_happy": true
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d491906..fc12e90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.2.6 (2014-05-15)
+- version bump
+- added `"jslint_happy": true` to own `.jsbeautifierrc`
+
+# v0.2.5 (2014-05-14)
+- fixed issue #7 (Place cursor back to edited place after beautifying)
+- fixed issue #8 (Ignore jsbeautify when editing .jsbeautifyrc in place)
+
 # v0.2.3 (2014-05-13)
 
 - support `.jsbeautifierrc` (thanks @karolyi)
diff --git a/package.json b/package.json
index 2e2f9b1..ee42c61 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom-beautify",
   "main": "./lib/atom-beautify",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "private": true,
   "description": "Beautify HTML, CSS and Javascript in Atom",
   "repository": "https://github.com/donaldpipowitch/atom-beautify",