]> git.parisson.com Git - pdf.js.git/commitdiff
Merge upstream.
authorBrendan Dahl <brendan.dahl@gmail.com>
Wed, 21 Mar 2012 23:13:24 +0000 (16:13 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Wed, 21 Mar 2012 23:13:24 +0000 (16:13 -0700)
1  2 
src/fonts.js
test/pdfs/.gitignore
test/test_manifest.json

diff --cc src/fonts.js
Simple merge
Simple merge
Simple merge