]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into lzw
authornotmasteryet <async.processingjs@yahoo.com>
Sun, 14 Aug 2011 17:12:31 +0000 (12:12 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Sun, 14 Aug 2011 17:12:31 +0000 (12:12 -0500)
1  2 
pdf.js

diff --cc pdf.js
Simple merge