review.tizen.org Git - platform/upstream/syslinux.git/commit

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8492da6 e535bec)

author	H. Peter Anvin <hpa@zytor.com>
	Tue, 22 Dec 2009 17:38:43 +0000 (09:38 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 22 Dec 2009 17:38:43 +0000 (09:38 -0800)
commit	2b164fd1078bc9640836f15598ed901cc7a31ae2
tree	05c661adf5920b2408fbd1961b3bd855c75732d8	tree \| snapshot
parent	8492da661cc77e26cd18e4cf307b78e50661ea29	commit \| diff
parent	e535becb865292360e808996409c1513df7d2be7	commit \| diff

Merge branch 'master' into fsc

Resolved Conflicts:
com32/Makefile
com32/lib/sys/open.c
com32/modules/Makefile
dos/Makefile
dos/com16.ld
dos/syslinux.c
version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

MCONFIG	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
com32/Makefile	diff1 \|	diff2 \|	blob \| history
com32/lib/Makefile	diff1 \|	diff2 \|	blob \| history
com32/lib/sys/open.c	diff1 \|	diff2 \|	blob \| history
com32/mboot/mboot.c	diff1 \|	diff2 \|	blob \| history
com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history
doc/comboot.txt	diff1 \|	diff2 \|	blob \| history
dos/Makefile	diff1 \|	diff2 \|	blob \| history
dos/syslinux.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;