From 97916a4cd296d541cc8f82d8907b11bdb8db5e1a Mon Sep 17 00:00:00 2001
From: Weston Platter <westonplatter@gmail.com>
Date: Sun, 13 Apr 2014 21:27:37 -0600
Subject: [PATCH] [release] 1.1.1 version bump and release

---
 CHANGES.md              | 17 ++++++++---------
 lib/phashion/version.rb |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 262eae6..4a7b18e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 History
-=========
+=======
+
+1.1.1 
+-----
+* Added Ruby method to call into pHash's Mexican Hat Wavelet funcition (issue #37, Terence Lee / @hone)
+* Removed duplicate version reference
 
 1.1.0
 -----
@@ -9,7 +14,7 @@ History
 
 1.0.8
 ------
-* Renamed the pHashion tar.gz archive as "pHash-0.9.6.tar.gz" to solve/enable install from github 
+* Renamed the pHashion tar.gz archive as "pHash-0.9.6.tar.gz" to solve/enable install from github.
 
 1.0.7
 ------
@@ -27,29 +32,24 @@ History
  
 1.0.5
 -------
-
 * Fix CImg.h compilation problems. [#10]
 
 1.0.4
 -------
-
 * Fix pthread linking on Ubuntu 11.04
 
 1.0.3
 -------
-
 * Update pHash to version 0.9.3 and CImg 1.4.7.
 * Fix a few build issues.
 
 1.0.2
 -------
-
 * Make installation much easier by distributing and building locally all the native dependencies.
   This includes pHash 0.9.0 and CImg 1.3.4.
 
 1.0.1
 -------
-
 * Remove RubyInline, use standard Ruby extension infrastructure.
 * Update duplicate threshold constant based on wider image testing.
 * Make duplicate threshold variable so users can tune it based on their dataset.
@@ -58,5 +58,4 @@ History
 
 1.0.0
 -------
-
-Initial release.
+* Initial release.
diff --git a/lib/phashion/version.rb b/lib/phashion/version.rb
index 4a9d183..9dc8b7f 100644
--- a/lib/phashion/version.rb
+++ b/lib/phashion/version.rb
@@ -1,3 +1,3 @@
 module Phashion
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end