]> 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>
Mon, 12 Mar 2012 20:23:33 +0000 (13:23 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Mon, 12 Mar 2012 20:23:33 +0000 (13:23 -0700)
1  2 
web/debugger.js
web/viewer.js

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