]> git.parisson.com Git - pdf.js.git/commit
projects / pdf.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7016416 d984916)
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into cff-issues
authornotmasteryet <async.processingjs@yahoo.com>
Wed, 6 Jul 2011 13:16:07 +0000 (08:16 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Wed, 6 Jul 2011 13:16:07 +0000 (08:16 -0500)
commit4169fe151d7efd6ed14553fea9c670b7857780f7
tree4fcb968e9ada4ef6daad8ffa8cc350de5fb294d2tree | snapshot
parent70164163de6966b1efc875edf3afaeb7594bd780commit | diff
parentd98491638082600201ca60f13c9a31ab1727fb26commit | diff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into cff-issues

Conflicts:
fonts.js
fonts.js diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.