]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into tree-53
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 5 Jan 2012 01:57:08 +0000 (19:57 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 5 Jan 2012 01:57:08 +0000 (19:57 -0600)
commitcaacd31a2cf381551d9e6825f25c96e483d201cf
tree1e909b33282c3cf1beb6ed5aeefc4e7d016b1b7d
parent3533e5ac6afd990e418c06b7eb7d8c6701554fdb
parentfbb9acc8cfd28c20e5c3fb669228a9c3e3883582
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into tree-53

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