]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41ebb55 ba04d85)
Merge remote branch 'upstream/master' into metrics
authorVivien Nicolas <21@vingtetun.org>
Wed, 21 Sep 2011 23:24:39 +0000 (01:24 +0200)
committerVivien Nicolas <21@vingtetun.org>
Wed, 21 Sep 2011 23:24:39 +0000 (01:24 +0200)
1  2 
web/viewer.html patch | diff1 | diff2 | blob | history

diff --cc web/viewer.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.