]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03ec82b 969422f)
Merge remote-tracking branch 'upstream/master' into smaskscale
authorBrendan Dahl <brendan.dahl@gmail.com>
Mon, 19 Dec 2011 01:31:51 +0000 (17:31 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Mon, 19 Dec 2011 01:31:51 +0000 (17:31 -0800)

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