]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select
authorArtur Adib <arturadib@gmail.com>
Tue, 29 Nov 2011 19:17:05 +0000 (14:17 -0500)
committerArtur Adib <arturadib@gmail.com>
Tue, 29 Nov 2011 19:17:05 +0000 (14:17 -0500)
commita544bed57e9f2d79cf6280075b6630fdf73b6af4
treeb71d674cc2c350e0f6c15db75baa67750d7795a6
parent4cfc5521639397c9bf84ee66c3e1234aa49608fc
parentfcc05b08bf0bed40b4865fa9be9ae12d245d3f14
Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select

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