]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 15 Sep 2011 02:45:12 +0000 (21:45 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 15 Sep 2011 02:45:12 +0000 (21:45 -0500)
commit1347db797c911c9813a45a784b23a573892c1caf
tree35175f001c31c0df211a1426cfde4c75dc2347f4
parente512000877759a429c36bd7159ca895e6fca03bb
parent4dd79a51c15c72aa19a554e07a57f00e9fa6910c
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

Conflicts:
test/test_manifest.json
pdf.js
test/test_manifest.json