Yury Delendik 19cf459943 Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n ...

Conflicts:
	web/viewer.html

2012-05-04 13:13:29 -05:00

..

metadata.inc

Move localization to l10n folders; create 'make locale'

2012-05-02 08:51:52 -05:00

viewer.properties

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

2012-05-04 13:13:29 -05:00