]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into bidi
authornotmasteryet <async.processingjs@yahoo.com>
Wed, 22 Feb 2012 00:23:00 +0000 (18:23 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Wed, 22 Feb 2012 00:23:00 +0000 (18:23 -0600)
commita8cdbcf315e133828d6444961b7df739fbcc496d
tree6451eba4c98b188e7b41d234d81a922e6c275498
parent26b58c0e4f18f3222881ae7c3c17565441308a37
parentf45f87b70b77bf9c7f871d72f70418717f362163
Merge remote-tracking branch 'mozilla/master' into bidi

Conflicts:
src/fonts.js
src/fonts.js