]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master'
authorVivien Nicolas <21@vingtetun.org>
Wed, 21 Sep 2011 22:45:12 +0000 (00:45 +0200)
committerVivien Nicolas <21@vingtetun.org>
Wed, 21 Sep 2011 22:45:12 +0000 (00:45 +0200)
1  2 
web/viewer.js

diff --cc web/viewer.js
Simple merge