]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n
authorYury Delendik <ydelendik@mozilla.com>
Wed, 2 May 2012 15:23:39 +0000 (10:23 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Wed, 2 May 2012 15:23:39 +0000 (10:23 -0500)
commitd64c40ea4bd744025a789f45edc8938eabbe326e
tree83bc648b717ca6a424bdc40939d5f7cc17d8146a
parent6c04bed1ce2e6c56d889c7ed3c2ef2cee507f63f
parent6368cc8e4316d63d629650b9b2917fc309ee93a5
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n

Conflicts:
web/viewer.js
web/viewer.js