]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4369a1a 12d3a75)
Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth
authorArtur Adib <arturadib@gmail.com>
Wed, 30 Nov 2011 20:58:44 +0000 (15:58 -0500)
committerArtur Adib <arturadib@gmail.com>
Wed, 30 Nov 2011 20:58:44 +0000 (15:58 -0500)
Conflicts:
web/viewer.js

1  2 
web/viewer.html patch | diff1 | diff2 | blob | history
web/viewer.js patch | diff1 | diff2 | blob | history

diff --cc web/viewer.html
index ebc0bcb0634098bc4792177aeee961b0390e613c,e441a984791fa93dd60972475b0e899fafccb11b..5164d0b1958e722651ba90e202994dfce79514ae
--- 1/web/viewer.html
--- 2/web/viewer.html
+++ b/web/viewer.html
@@@ -25,9 -25,10 +25,9 @@@
          <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 -->
  
 -        <script type="text/javascript" src="viewer.js"></script>
    </head>
  
    <body>
diff --cc web/viewer.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.