]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b872a08 c15311c)
Merge remote-tracking branch 'upstream/master' into cmykjpgnorm
authorBrendan Dahl <brendan.dahl@gmail.com>
Wed, 9 Nov 2011 17:50:57 +0000 (09:50 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Wed, 9 Nov 2011 17:50:57 +0000 (09:50 -0800)

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