]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into text-select
authorArtur Adib <arturadib@gmail.com>
Wed, 2 Nov 2011 15:23:42 +0000 (11:23 -0400)
committerArtur Adib <arturadib@gmail.com>
Wed, 2 Nov 2011 15:23:42 +0000 (11:23 -0400)
commit49a303f2f2bb875c6836be38139aaf087b7a010a
tree805bf3a85e4e743c053ab406f08092a6b06f3b3f
parentc74d7b8777d9b963bbb7b56dac957db5b51647db
parent112115c0132c369fb53528d98f5b600b88c555ef
Merge branch 'refs/heads/master' into text-select

Conflicts:
src/core.js
src/canvas.js
src/core.js