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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Mon, 5 Dec 2011 23:01:45 +0000 (17:01 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Mon, 5 Dec 2011 23:01:45 +0000 (17:01 -0600)
commit	dbf869f19537dda6b47be3ae1d8b70569147b22c
tree	b7053265b3538030c299270a00bab98126e8e100	tree \| snapshot
parent	de17cb32cde08af5b8e5eb84e8421387dbdc5e88	commit \| diff
parent	c615342962e89af159779188c0e253a4333150aa	commit \| diff

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into forms-1

Conflicts:
web/viewer.css

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