]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 016c6e2 8b048a6)
Merge remote-tracking branch 'upstream/master'
authorKalervo Kujala <kkujala@>
Mon, 26 Sep 2011 17:04:42 +0000 (20:04 +0300)
committerKalervo Kujala <kkujala@>
Mon, 26 Sep 2011 17:04:42 +0000 (20:04 +0300)
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.