merged in changes from coeamyd/master. Closes #33 and closes #34

azoff · Dec 11, 2011 · f86cc67 · f86cc67
1 parent 0a109dd
commit f86cc67
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-Overscroll v1.5.1.1
+Overscroll v1.5.2
-===================
+=================
-Wednesday, December 7th 2011
+Sunday, December 11th 2011
 
 Overscroll is a jQuery Plugin that emulates the iPhone scrolling experience in a browser. It is intended for use with the latest version of jQuery
 <http://code.jquery.com/jquery-latest.js>
@@ -77,7 +77,7 @@ As of 1.4.4 you can call the `overscroll` constructor on a jQuery element as muc
 
 Change Log
 ----------
- * __1.5.1.1__
+ * __1.5.2__
   - Added zIndex option for configuring thumb elements' z-index
        + <https://github.com/azoff/Overscroll/issues/33>
   - Added handling of external scroll event for repositioning thumbs

diff --git a/jquery.overscroll.js b/jquery.overscroll.js
@@ -1,5 +1,5 @@
 /**@license
- * Overscroll v1.5.1.1
+ * Overscroll v1.5.2
  *  A jQuery Plugin that emulates the iPhone scrolling experience in a browser.
  *  http://azoffdesign.com/overscroll
  *
@@ -13,7 +13,7 @@
  * For API documentation, see the README file
  *  http://azof.fr/pYCzuM
  *
- * Date: Wednesday, December 7th 2011
+ * Date: Sunday, December 11th 2011
  */
 
 /*jslint onevar: true, strict: true */

diff --git a/jquery.overscroll.min.js b/jquery.overscroll.min.js