]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into text-select
authorArtur Adib <arturadib@gmail.com>
Tue, 8 Nov 2011 13:56:52 +0000 (08:56 -0500)
committerArtur Adib <arturadib@gmail.com>
Tue, 8 Nov 2011 13:56:52 +0000 (08:56 -0500)
commit46a48a56b74f9dd488965f6ff4ea20acc4ae8f55
tree27c6e1e478ce761eb96cbcaaaef73c1546bff5c5
parent9ddc40c3d7b82f3059e3864c887f05c649b575ca
parent085710f9db61e05b5b992b547022ab5af7f0efa7
Merge branch 'refs/heads/master' into text-select

Conflicts:
src/core.js
src/canvas.js
src/core.js
web/viewer.css