]> git.parisson.com Git - pdf.js.git/commit
fix merge conflicts
author= <=>
Tue, 4 Oct 2011 00:18:47 +0000 (17:18 -0700)
committer= <=>
Tue, 4 Oct 2011 00:18:47 +0000 (17:18 -0700)
commitff2dea38ec708954fcdd10a755d39086da21168d
tree0db5d24867ba9bc015ee5c49d87999cb7ac2169f
parent5f810177268b2882f659fc5115d1c7f024bc34d7
parent157261a7dc226860bdce4159c7f2deb2d97770d7
fix merge conflicts
fonts.js
pdf.js
test/test_manifest.json