]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf86d1b 52b67e7)
Merge remote branch 'upstream/master'
authorVivien Nicolas <21@vingtetun.org>
Tue, 23 Aug 2011 14:40:49 +0000 (16:40 +0200)
committerVivien Nicolas <21@vingtetun.org>
Tue, 23 Aug 2011 14:40:49 +0000 (16:40 +0200)
Conflicts:
web/viewer.js

1  2 
web/viewer.js patch | diff1 | diff2 | blob | history

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