]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a825368 637708c)
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)
Conflicts:
fonts.js


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.