]> 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>
Fri, 27 Apr 2012 14:59:36 +0000 (10:59 -0400)
committerArtur Adib <arturadib@gmail.com>
Fri, 27 Apr 2012 14:59:36 +0000 (10:59 -0400)
1  2 
web/viewer.html

diff --cc web/viewer.html
Simple merge