]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of https://github.com/andreasgal/pdf.js
authorIonuț G. Stan <ionut.g.stan@gmail.com>
Fri, 28 Oct 2011 11:34:56 +0000 (14:34 +0300)
committerIonuț G. Stan <ionut.g.stan@gmail.com>
Fri, 28 Oct 2011 11:34:56 +0000 (14:34 +0300)
commitb7573709c26a51c4479e32cf8a25e93f6d7bd8f4
tree9fea1fd2a22bb33806c3afcd27e7a9884fc8e961
parent009d6a8863fae350c8b95f1a6f0936f7b3fbf12d
parent21a6467b2328c0eecf34062169a10a53f0cac7e6
Merge branch 'master' of https://github.com/andreasgal/pdf.js

Conflicts:
pdf.js
src/canvas.js
src/util.js