]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'new-ui' of github.com:mozilla/pdf.js into new-ui
authorArtur Adib <arturadib@gmail.com>
Wed, 25 Apr 2012 21:33:06 +0000 (17:33 -0400)
committerArtur Adib <arturadib@gmail.com>
Wed, 25 Apr 2012 21:33:06 +0000 (17:33 -0400)
1  2 
web/viewer.css
web/viewer.js

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