]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da4a213 ecd62a3)
Merge remote-tracking branch 'mozilla/l10n' into l10n
authorYury Delendik <ydelendik@mozilla.com>
Thu, 3 May 2012 16:34:07 +0000 (11:34 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Thu, 3 May 2012 16:34:07 +0000 (11:34 -0500)
Conflicts:
web/locale.properties


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.