Merge pull request #122 from dduponchel/release_v2.2.1

Release v2.2.1
Stuk · Apr 24, 2014 · e8ec15a · e8ec15a
2 parents 306fe4a + 7c530b4
commit e8ec15a
Show file tree

Hide file tree

Showing 8 changed files with 5,896 additions and 59 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+### v2.2.1, 2014-04-23
+ - fix unreadable generated file on Windows 8 (see [#112](https://github.com/Stuk/jszip/issues/112)).
+ - replace zlibjs with pako.
+
 ### v2.2.0, 2014-02-25
  - make the `new` operator optional before the `JSZip` constructor (see [#93](https://github.com/Stuk/jszip/pull/93)).
  - update zlibjs to v0.2.0.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jszip",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "homepage": "http://stuartk.com/jszip",
   "authors": [
     "Stuart Knightley <stuart@stuartk.com>"

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
   "name": "jszip",
   "repo": "Stuk/jszip",
   "description": "Create, read and edit .zip files with Javascript http://stuartk.com/jszip",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "keywords": [
     "zip",
     "deflate",

diff --git a/dist/jszip.js b/dist/jszip.js
diff --git a/dist/jszip.min.js b/dist/jszip.min.js
diff --git a/index.html b/index.html
@@ -657,7 +657,7 @@ <h3>License</h3>
       </p>
 
       <h3>Version</h3>
-      <p>2.2.0</p>
+      <p>2.2.1</p>
       <p>See the <a href="#migrating_guide">migrating guide</a> when updating the library!</p>
 
       <h3>Todo</h3>

diff --git a/lib/license_header.js b/lib/license_header.js
@@ -6,6 +6,6 @@ JSZip - A Javascript class for generating and reading zip files
 (c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
 Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
 
-JSZip uses the library zlib.js released under the following license :
-zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/master/LICENSE
 */
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jszip",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Stuart Knightley <stuart@stuartk.com>",
   "description": "Create, read and edit .zip files with Javascript http://stuartk.com/jszip",
   "scripts": {