]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c48f856 ca7306c)
Merge remote-tracking branch 'upstream/master' into boundingbox
author= <=>
Wed, 5 Oct 2011 16:19:02 +0000 (09:19 -0700)
committer= <=>
Wed, 5 Oct 2011 16:19:02 +0000 (09:19 -0700)
1  2 
pdf.js patch | diff1 | diff2 | blob | history

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