]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cd6968 8afd1a6)
Merge branch 'master' into tiling
authorsbarman <sbarman@L3CWZ5T.(none)>
Sun, 19 Jun 2011 19:15:52 +0000 (12:15 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Sun, 19 Jun 2011 19:15:52 +0000 (12:15 -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.