]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into l10n
authorYury Delendik <ydelendik@mozilla.com>
Tue, 1 May 2012 22:19:02 +0000 (17:19 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Tue, 1 May 2012 22:19:02 +0000 (17:19 -0500)
commit89b6c74a537e926131d4675dcbde1408f6cedc61
treeb5dbc24ade7c03556bf5e18cf8c4c96c075700b5
parent72ec5d070b7ab97df8a164d1366b3aee990974fd
parent7712099063172282cdbf47f0bd350b0e6dad43ce
Merge remote-tracking branch 'mozilla/master' into l10n

Conflicts:
web/viewer.css
web/viewer.html
web/viewer.css
web/viewer.html
web/viewer.js