]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 396dbe5 babcf86)
Merge branch 'master' into encoding
authorsbarman <sbarman@L3CWZ5T.(none)>
Fri, 8 Jul 2011 22:29:20 +0000 (15:29 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Fri, 8 Jul 2011 22:29:20 +0000 (15:29 -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.