Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth

Conflicts:
	web/viewer.js
This commit is contained in:
Artur Adib 2011-11-30 15:58:44 -05:00
commit 5aad7cb7b5
34 changed files with 7101 additions and 278 deletions

View file

@ -25,7 +25,7 @@
<script type="text/javascript" src="../src/pattern.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../src/stream.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../src/worker.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../external/jpgjs/jpg.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript">PDFJS.workerSrc = '../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE -->
</head>