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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Sat, 24 Sep 2011 14:57:59 +0000 (09:57 -0500)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sat, 24 Sep 2011 14:57:59 +0000 (09:57 -0500)
commit	39ba5324a762b67cced16f4b15d4f8557843bbf8
tree	23ce0ab1b70dfde0be94fb0020932027dce6519c	tree \| snapshot
parent	91a5f73708d1c15f50f6b9543ec2ad015828e450	commit \| diff
parent	b82065ec4b6fc0bc323a1494211e1f3eee472004	commit \| diff

Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into invalidpdf-1

Conflicts:
test/test_manifest.json

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