]> git.parisson.com Git - pdf.js.git/commit
projects / pdf.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5b0357 3ea4e25)
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs
authornotmasteryet <async.processingjs@yahoo.com>
Mon, 12 Sep 2011 23:14:18 +0000 (18:14 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Mon, 12 Sep 2011 23:14:18 +0000 (18:14 -0500)
commit40e0cb40a670f47ff76971bcf0bbcade6ef9bb13
tree4f7efd240d59b8092540d470e7c94207e9ea480etree | snapshot
parentb5b0357dca98233981c00523943f95388084d5b2commit | diff
parent3ea4e25fb37c465008c7d122723c9154606105b9commit | diff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

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