]> git.parisson.com Git - pdf.js.git/commit
Merge and fix upstream conflict.
authorBrendan Dahl <brendan.dahl@gmail.com>
Tue, 29 Nov 2011 01:49:12 +0000 (17:49 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Tue, 29 Nov 2011 01:49:12 +0000 (17:49 -0800)
commiteaac81894632b02f95a6a7f46dfe1f916cc8cc01
tree37c962d566cba43109d9b8832b7999e2d8313963
parentd6925b13ba3749afd29a1d50db7eb6c2509ae6eb
parent2e70984f38b16979fdb766afc6161be7c1c7797f
Merge and fix upstream conflict.
web/viewer.js