]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into text-select
authorArtur Adib <arturadib@gmail.com>
Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
committerArtur Adib <arturadib@gmail.com>
Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
commit5c261b46ccd9bad668071eec71ff9e9c0a41087f
tree7e2fa9f9effa65089dc80ed64d58ccc91ec4a670
parentbaf395ab16dabca43d977162534b35694ab762fc
parent4bdc252cb3e958b8bd8aaea0487953a29bf25ef5
Merge branch 'refs/heads/master' into text-select

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