]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into disableworker-in-url
authorArtur Adib <arturadib@gmail.com>
Fri, 9 Dec 2011 20:38:08 +0000 (15:38 -0500)
committerArtur Adib <arturadib@gmail.com>
Fri, 9 Dec 2011 20:38:08 +0000 (15:38 -0500)
commit8c728a884ea1f1ca14c85f190afc2c2f3f223285
tree2423d2f213a72c5d4d0142203ba1433b3e75c5ba
parent8439830d4e01c98a21bd88c2ed643f10d466f6bf
parentd29e39d754803b874a8296971e2fb9160d9feb9d
Merge branch 'refs/heads/master' into disableworker-in-url

Conflicts:
web/viewer.js
web/viewer.js