]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of git://github.com/mozilla/pdf.js into sidebar-pinning
authorgigaherz <gigaherz@gmail.com>
Mon, 13 Feb 2012 08:35:46 +0000 (09:35 +0100)
committergigaherz <gigaherz@gmail.com>
Mon, 13 Feb 2012 08:35:46 +0000 (09:35 +0100)
1  2 
web/viewer.css
web/viewer.js

diff --cc web/viewer.css
Simple merge
diff --cc web/viewer.js
Simple merge