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: 034583e 5afef14)

author	Brendan Dahl <brendan.dahl@gmail.com>
	Tue, 15 May 2012 17:33:01 +0000 (10:33 -0700)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Tue, 15 May 2012 17:33:01 +0000 (10:33 -0700)
commit	080c3e79fc7b76ff92f9abebd594b8b7f69c8232
tree	d2ec08d6cddf8d905cd4122ad25f6b047cd8169c	tree \| snapshot
parent	034583e1a151bc35aa1680e3cf5833c20c303cf3	commit \| diff
parent	5afef149eaebcbae6d6e5868e01d2005df7a95d5	commit \| diff

Merge upstream. Use new l10n.

extensions/firefox/components/PdfStreamConverter.js	diff1 \|	diff2 \|	blob \| history
l10n/en-US/chrome.properties	\|	\|	blob
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
web/viewer.js	diff1 \|	diff2 \|	blob \| history

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