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

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

author	Yury Delendik <ydelendik@mozilla.com>
	Fri, 4 May 2012 18:13:29 +0000 (13:13 -0500)
committer	Yury Delendik <ydelendik@mozilla.com>
	Fri, 4 May 2012 18:13:29 +0000 (13:13 -0500)
commit	19cf4599435e2d8db0a3b92a5e3354e22bda8484
tree	f94b8a56b1a55b1ef9ae0961393d1c9c55396f30	tree \| snapshot
parent	89156cec89673b5d97cb4ebeb404509c41b47932	commit \| diff
parent	6c1e03340b955977acbd498588bda16837bfae48	commit \| diff

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

Conflicts:
web/viewer.html

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