]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07f8145 2a1fd97)
Merge branch 'master' into shading
authorsbarman <sbarman@L3CWZ5T.(none)>
Mon, 11 Jul 2011 16:25:22 +0000 (09:25 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Mon, 11 Jul 2011 16:25:22 +0000 (09:25 -0700)
Conflicts:
pdf.js

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.