]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' into new-ui
authorArtur Adib <arturadib@gmail.com>
Wed, 18 Apr 2012 19:02:49 +0000 (15:02 -0400)
committerArtur Adib <arturadib@gmail.com>
Wed, 18 Apr 2012 19:02:49 +0000 (15:02 -0400)
commit7e51d2b1f732afeadabdc578f125733a0ab1cd8c
tree7abcfd9d284c2b0534f4d7c58488f587fb89ed77
parentd9db7af4c88ce5b07b9237cb1836c3af91057b13
parentcec7a92a993383e47abe8727f5cfca917f4539c5
Merge branch 'master' into new-ui

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