]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into print-visible
authorYury Delendik <ydelendik@mozilla.com>
Fri, 25 May 2012 12:38:50 +0000 (07:38 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Fri, 25 May 2012 12:38:50 +0000 (07:38 -0500)
commitdc09e164da8924b8a3d0e271bc28ad4434512465
treebb7b0e1588dd7d435510c016a5aa2252d0922d15
parenta4f319104b13f424ea52ca280993b267d4d39726
parentf59ae949baa514ef956249b17e9bec6178ff9e2d
Merge remote-tracking branch 'mozilla/master' into print-visible

Conflicts:
web/viewer.css
web/viewer.css