git.parisson.com Git - pdf.js.git/commit

]> git.parisson.com Git - pdf.js.git/commit

projects / pdf.js.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8c1fd33 d64c40e)

author	Adil Allawi <adil@diwan.com>
	Wed, 2 May 2012 15:59:25 +0000 (16:59 +0100)
committer	Adil Allawi <adil@diwan.com>
	Wed, 2 May 2012 15:59:25 +0000 (16:59 +0100)
commit	2c6026512db4b937a4968024f3c05209552bd98e
tree	927a524d3bca01e50e73e3aa1b44676a719813b2	tree \| snapshot
parent	8c1fd3334d4640f4ba95e1880e14c432ca2fabf9	commit \| diff
parent	d64c40ea4bd744025a789f45edc8938eabbe326e	commit \| diff

Merge branch 'l10n' of https://github.com/mozilla/pdf.js into l10n

Conflicts:
web/locale.properties

web/locale.properties

|

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