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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Mon, 20 Feb 2012 18:41:19 +0000 (12:41 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Mon, 20 Feb 2012 18:41:19 +0000 (12:41 -0600)
commit	28b4dac2d8fb1a9330adbaaef276a309bdee4def
tree	f78e6d429ef54001b45c9017e7e92e8177e6b6e2	tree \| snapshot
parent	6c7e7df6dad89b931977f3144c2ac78d2cdb8cb8	commit \| diff
parent	e0e6209baf3727e06f942fbd3f5f575e7183acb5	commit \| diff

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

Conflicts:
web/viewer.html

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