]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of github.com:andreasgal/pdf.js
authorAndreas Gal <andreas.gal@gmail.com>
Fri, 6 May 2011 08:16:20 +0000 (01:16 -0700)
committerAndreas Gal <andreas.gal@gmail.com>
Fri, 6 May 2011 08:16:20 +0000 (01:16 -0700)
1  2 
pdf.js

diff --cc pdf.js
Simple merge