]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d76f5f6 2f10d24)
Merge remote-tracking branch 'origin/nativejpegsmask' into decodemap
authorBrendan Dahl <brendan.dahl@gmail.com>
Tue, 13 Dec 2011 17:12:26 +0000 (09:12 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Tue, 13 Dec 2011 17:12:26 +0000 (09:12 -0800)

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