]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c1fd33 d64c40e)
Merge branch 'l10n' of https://github.com/mozilla/pdf.js into l10n
authorAdil Allawi <adil@diwan.com>
Wed, 2 May 2012 15:59:25 +0000 (16:59 +0100)
committerAdil Allawi <adil@diwan.com>
Wed, 2 May 2012 15:59:25 +0000 (16:59 +0100)
Conflicts:
web/locale.properties

1  2 
web/locale.properties patch | diff1 | | blob | history

diff --cc web/locale.properties
index 4bfec971f97647659afa56736b574a8f6bb55a74,0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 100644,000000..100644
--- 1/web/locale.properties
--- /dev/null
+++ b/web/locale.properties
Unnamed repository; edit this file 'description' to name the repository.