]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into hacks
authornotmasteryet <async.processingjs@yahoo.com>
Sun, 3 Jul 2011 23:08:44 +0000 (18:08 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Sun, 3 Jul 2011 23:08:44 +0000 (18:08 -0500)
commita14b9f13efd39a4c1d5e0c622640ff9b0e6b3969
tree6c0435ceef4ac3c187c573339254deccea221d64
parenta82536881de47589edfa74c955594762acbaa897
parent637708cf1a15e9d3a680f1060715c6ecc6b5b68d
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into hacks

Conflicts:
fonts.js