]> git.parisson.com Git - pdf.js.git/commitdiff
merging upstream
authorArtur Adib <arturadib@gmail.com>
Tue, 29 May 2012 16:16:57 +0000 (12:16 -0400)
committerArtur Adib <arturadib@gmail.com>
Tue, 29 May 2012 16:16:57 +0000 (12:16 -0400)
1  2 
web/viewer.css

diff --cc web/viewer.css
Simple merge