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

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

author	Yury Delendik <ydelendik@mozilla.com>
	Mon, 21 May 2012 19:07:30 +0000 (14:07 -0500)
committer	Yury Delendik <ydelendik@mozilla.com>
	Mon, 21 May 2012 19:07:30 +0000 (14:07 -0500)
commit	74616848caaeaf62944bf20bc036943899f55c6e
tree	a97da9464d3cd752e5a819842e334fb34a0bb76c	tree \| snapshot
parent	609b2a797edeb4e08e8eb273132bb1823c13e7ed	commit \| diff
parent	1e41f65735f3a3b7063e8f0d233bd60a408b5d82	commit \| diff

Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
l10n/en-US/viewer.properties
web/viewer.html

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