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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2cb593a 808d43e)

author	Erwan Velu <erwanaliasr1@gmail.com>
	Tue, 25 Jan 2011 19:41:50 +0000 (20:41 +0100)
committer	Erwan Velu <erwanaliasr1@gmail.com>
	Tue, 25 Jan 2011 19:41:50 +0000 (20:41 +0100)
commit	995558ff657a357b3e44a299525ff66dbb0300b3
tree	b6caeafa866311926705b2eba695fbd699220f60	tree \| snapshot
parent	2cb593ae927a80e856a255c9e484d16038033f62	commit \| diff
parent	808d43ea43c9df30a0a6922ef4cb4678634d41ab	commit \| diff

Merge branch 'master' into chouffe

Conflicts:
com32/hdt/hdt.h

com32/hdt/Makefile	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-cpu.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-hdt.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-kernel.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-pci.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-pxe.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli.h	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-common.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-common.h	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-menu.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;