]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 19 Jan 2012 02:14:43 +0000 (20:14 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 19 Jan 2012 02:14:43 +0000 (20:14 -0600)
commitf3ab505b41bb4ac7392dc036ff22385c99cc2d9e
tree63da01532758d84ae70659a8b8acdea9a646f202
parente43afd3fe5026fe292ed54f6ce1628bc096b03ee
parentee8c86d2b6f336440d298a509f12fb979d021bd5
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

Conflicts:
test/test_manifest.json
test/test_manifest.json