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: 5d67183 f59ae94)

author	Brendan Dahl <brendan.dahl@gmail.com>
	Thu, 24 May 2012 21:01:10 +0000 (14:01 -0700)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Thu, 24 May 2012 21:01:10 +0000 (14:01 -0700)
commit	2da12930a6f962253e9172ed18435f23c8b5025b
tree	c00c6d1b6a27577d9b0fde2d7653040212c23aed	tree \| snapshot
parent	5d67183b4d251d929752b2b39377c94fd7f9c07f	commit \| diff
parent	f59ae949baa514ef956249b17e9bec6178ff9e2d	commit \| diff

Merge branch 'master' of github.com:mozilla/pdf.js into fallback-ui

Conflicts:
extensions/firefox/components/PdfStreamConverter.js

extensions/firefox/components/PdfStreamConverter.js	diff1 \|	diff2 \|	blob \| history
make.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/util.js	diff1 \|	diff2 \|	blob \| history
src/worker.js	diff1 \|	diff2 \|	blob \| history
web/viewer.js	diff1 \|	diff2 \|	blob \| history

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