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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Thu, 19 Jan 2012 23:46:48 +0000 (17:46 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Thu, 19 Jan 2012 23:46:48 +0000 (17:46 -0600)
commit	016fd3282e689816c4920c12879b7c927d55f3c7
tree	cf4b3bd931ee48f974066cb5141584cfa129c2c5	tree \| snapshot
parent	bfd1d427c7f042f8becb3b6117ed9dd28b7993b4	commit \| diff
parent	d9f1365b9ca7b90440895fa0be357ab6fc849f75	commit \| diff

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

Conflicts:
test/pdfs/.gitignore

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