]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 435d9f2 7185a12)
Merge remote-tracking branch 'upstream/master' into integration
author= <=>
Fri, 21 Oct 2011 16:06:08 +0000 (09:06 -0700)
committer= <=>
Fri, 21 Oct 2011 16:06:08 +0000 (09:06 -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.