]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into issue-863
authornotmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
commitfa89ebe5375956b0648cd2b226070f1796a62b7e
tree0ebf9e3a4187e425b566ef7a68d3e3f110e81e1d
parent54c31968e7158e0ccb7073134411d186e157b2a7
parentefd82ab5bd397edd982d298c645b987e7e770b04
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into issue-863

Conflicts:
test/pdfs/.gitignore
test/pdfs/.gitignore
test/test_manifest.json