Skip to content

Commit

Permalink
merged with master
Browse files Browse the repository at this point in the history
  • Loading branch information
fchasen committed Jan 24, 2015
2 parents f1abf58 + a45da8d commit 0dec164
Show file tree
Hide file tree
Showing 21 changed files with 174 additions and 54 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Get the minified code from the build folder:
<script src="../build/epub.min.js"></script>
```

If you plan on using compressed (zipped) epubs (any .epub file) include the minified version of [JSZip.js](http://stuk.github.io/jszip/)
If you plan on using compressed (zipped) epubs (any .epub file) include the minified version of [JSZip.js](http://stuk.github.io/jszip/) + Mime-types which can be found in [build/libs](https://raw.githubusercontent.com/futurepress/epub.js/master/build/libs/zip.min.js)

```html
<!-- Zip JS -->
Expand Down
48 changes: 38 additions & 10 deletions build/epub.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/epub.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/epub.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/epub.min.map

Large diffs are not rendered by default.

48 changes: 38 additions & 10 deletions build/epub_no_underscore.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/epub_no_underscore.js.map

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/reader.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/reader.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0dec164

Please sign in to comment.