]> git.parisson.com Git - pdf.js.git/commit
fix merge conflicts
author= <=>
Tue, 4 Oct 2011 15:52:15 +0000 (08:52 -0700)
committer= <=>
Tue, 4 Oct 2011 15:52:15 +0000 (08:52 -0700)
commit8f571355138a4d905a75b1fc6d66f01506b6f7ab
tree12792aef92197c294867979fd9d5e18b6360de9f
parentff2dea38ec708954fcdd10a755d39086da21168d
parent1508c03414b42d3e5bcfc40570c0aaf5ee6125d0
fix merge conflicts
fonts.js
pdf.js
test/test_manifest.json