]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/mozilla/pdf.js into stats
authorBrendan Dahl <brendan.dahl@gmail.com>
Tue, 21 Feb 2012 03:37:18 +0000 (19:37 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Tue, 21 Feb 2012 03:37:18 +0000 (19:37 -0800)
1  2 
web/viewer.js

diff --cc web/viewer.js
Simple merge