]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into textsearch
authorYury Delendik <ydelendik@mozilla.com>
Thu, 24 May 2012 21:04:09 +0000 (16:04 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Thu, 24 May 2012 21:04:09 +0000 (16:04 -0500)
commitd370f69978fcfa0e953a717c8e7f542221a42df8
tree7f39279394552aa3a31d1ed789c098a9c4218aa1
parentb8128f69ba12110aa78e4214417cc6867cf0dfeb
parentf59ae949baa514ef956249b17e9bec6178ff9e2d
Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
extensions/firefox/components/PdfStreamConverter.js
extensions/firefox/components/PdfStreamConverter.js
src/evaluator.js
src/fonts.js