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 16:32:16 +0000 (11:32 -0500)
committer	Yury Delendik <ydelendik@mozilla.com>
	Mon, 21 May 2012 16:32:16 +0000 (11:32 -0500)
commit	609b2a797edeb4e08e8eb273132bb1823c13e7ed
tree	dfe3c102c23b94d8faf2516b44e5ea9d1ddd7e28	tree \| snapshot
parent	55d9a53e40fa4b41c0710e82b0758103352437dd	commit \| diff
parent	ef1c68d26d314dc7e48bfc0da27368069ddad262	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.