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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Sat, 17 Sep 2011 16:23:34 +0000 (11:23 -0500)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sat, 17 Sep 2011 16:23:34 +0000 (11:23 -0500)
commit	0b1b8da982808681bbb48a2847ce69d58201ddd6
tree	8a95e8262b8792a01abaa4e09ccfeee1b8743a5b	tree \| snapshot
parent	582b760a658b3814996ba56aacb10fdc1e4b8c00	commit \| diff
parent	fe010910536a86b9f4e9f24446a71e0181d3f821	commit \| diff

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

Conflicts:
test/test_manifest.json

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