]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into l10n-1
authorYury Delendik <ydelendik@mozilla.com>
Mon, 30 Apr 2012 23:32:37 +0000 (18:32 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Mon, 30 Apr 2012 23:32:37 +0000 (18:32 -0500)
commit29bde9d528a74158f43f343fb16b7fbd1685c518
tree55411d4a6df5875d96ee19035943b061a5a96f59
parent7859ba89c31eb1e11edd7ff2ce38fb95ea98142c
parentbd440ef564848f4b473ad79014c2a55510fd2333
Merge remote-tracking branch 'mozilla/master' into l10n-1

Conflicts:
web/viewer.html
web/locale.properties
web/viewer.html
web/viewer.js