]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b6e97d 9701f8d)
Merge remote-tracking branch 'upstream/master' into CIDFont
authorAdil Allawi <adil@diwan.com>
Tue, 12 Jul 2011 03:01:48 +0000 (04:01 +0100)
committerAdil Allawi <adil@diwan.com>
Tue, 12 Jul 2011 03:01:48 +0000 (04:01 +0100)
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.