]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ad3a9c 8096d74)
Merge remote-tracking branch 'origin/decodemap' into smaskscale
authorBrendan Dahl <brendan.dahl@gmail.com>
Thu, 15 Dec 2011 23:20:36 +0000 (15:20 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Thu, 15 Dec 2011 23:20:36 +0000 (15:20 -0800)
1  2 
src/image.js patch | diff1 | diff2 | blob | history

diff --cc src/image.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.