]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/new-ui' into new-ui
authorBrendan Dahl <brendan.dahl@gmail.com>
Fri, 13 Apr 2012 21:15:15 +0000 (14:15 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Fri, 13 Apr 2012 21:15:15 +0000 (14:15 -0700)
1  2 
web/viewer.css
web/viewer.html

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