]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abad94d f7f7269)
Merge remote-tracking branch 'upstream/master' into smaskscale
authorBrendan Dahl <brendan.dahl@gmail.com>
Fri, 16 Dec 2011 18:11:40 +0000 (10:11 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Fri, 16 Dec 2011 18:11:40 +0000 (10:11 -0800)

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