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

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

projects / pdf.js.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6cd9ae0 f991af0)

author	Artur Adib <arturadib@gmail.com>
	Tue, 29 May 2012 15:54:11 +0000 (11:54 -0400)
committer	Artur Adib <arturadib@gmail.com>
	Tue, 29 May 2012 15:54:11 +0000 (11:54 -0400)
commit	9597efb3f418c4c8780ae04678a4311971972e45
tree	eec1bed5efce03dd470b6aed17fc90db41efc0ef	tree \| snapshot
parent	6cd9ae01cc2cea9d6fbd22670b0b2a1ebf3eef48	commit \| diff
parent	f991af003d617e9d10cf5492ea9623d5cce84277	commit \| diff

merge upstream

extensions/firefox/components/PdfStreamConverter.js	diff1 \|	diff2 \|	blob \| history
src/api.js	diff1 \|	diff2 \|	blob \| history
src/core.js	diff1 \|	diff2 \|	blob \| history
src/evaluator.js	diff1 \|	diff2 \|	blob \| history
src/fonts.js	diff1 \|	diff2 \|	blob \| history
src/worker.js	diff1 \|	diff2 \|	blob \| history
web/viewer.css	diff1 \|	diff2 \|	blob \| history
web/viewer.html	diff1 \|	diff2 \|	blob \| history
web/viewer.js	diff1 \|	diff2 \|	blob \| history

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