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: 1ef4c94 7ea770f)

author	Kalervo Kujala <kkujala@com>
	Thu, 8 Dec 2011 22:28:31 +0000 (00:28 +0200)
committer	Kalervo Kujala <kkujala@com>
	Thu, 8 Dec 2011 22:28:31 +0000 (00:28 +0200)
commit	cd01302de8f58c77b1a07779b87cbb3e324b9a94
tree	e59eaa67f3d9ddd2290c456d2b6cda1bab12b871	tree \| snapshot
parent	1ef4c94de20eaae4a1f010eb0660b693e1c71f51	commit \| diff
parent	7ea770fd08d1b4b8ba8121af204358958907ecc8	commit \| diff

Merge remote-tracking branch 'upstream/master' into style

Conflicts:
src/image.js
src/pattern.js

src/canvas.js	diff1 \|	diff2 \|	blob \| history
src/core.js	diff1 \|	diff2 \|	blob \| history
src/fonts.js	diff1 \|	diff2 \|	blob \| history
src/image.js	diff1 \|	diff2 \|	blob \| history
src/obj.js	diff1 \|	diff2 \|	blob \| history
src/pattern.js	diff1 \|	diff2 \|	blob \| history

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