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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8f18953 1da816e)

author	H. Peter Anvin <hpa@zytor.com>
	Mon, 25 Jan 2010 00:25:34 +0000 (16:25 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Mon, 25 Jan 2010 00:25:34 +0000 (16:25 -0800)
commit	95e6215b6f1d31eebdb1ddeb4c13007c5af30c23
tree	5dbce6408bb350b242e5c4dd592da103ed6cfb86	tree \| snapshot
parent	8f189531a58aef0655cd04a620931da3a0157eaa	commit \| diff
parent	1da816e5101d61edc8a01e3c76a1b89933a8b863	commit \| diff

Merge branch 'master' into fsc

Conflicts:
com32/lib/MCONFIG
com32/lib/readdir.c

MCONFIG	diff1 \|	diff2 \|	blob \| history
MCONFIG.embedded	diff1 \|	diff2 \|	blob \| history
com32/MCONFIG	diff1 \|	diff2 \|	blob \| history
com32/lib/MCONFIG	diff1 \|	diff2 \|	blob \| history
com32/lib/closedir.c	diff1 \|	diff2 \|	blob \| history
com32/lib/opendir.c	diff1 \|	diff2 \|	blob \| history
com32/lib/readdir.c	diff1 \|	diff2 \|	blob \| history
com32/rosh/rosh.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;