review.tizen.org Git - profile/ivi/syslinux.git/commit

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 15626ed c31b535)

author	Pierre-Alexandre Meyer <pierre@mouraf.org>
	Sat, 11 Apr 2009 01:49:24 +0000 (18:49 -0700)
committer	Pierre-Alexandre Meyer <pierre@mouraf.org>
	Sat, 11 Apr 2009 01:49:24 +0000 (18:49 -0700)
commit	55de9cbffb0377dec13860a4aeb7a66e4c2b500e
tree	4140805dbea3b539c0d0ca0341d917c748f789e3	tree \| snapshot
parent	15626ed816a937f029a09ad0dd368bd0cccb4a2b	commit \| diff
parent	c31b535638176cf076b8a5adaac6f711cea0eb41	commit \| diff

Merge commit 'hdt-erwan/master' into for-erwan

Conflicts:

com32/hdt/hdt-ata.c
com32/hdt/hdt-cli-pxe.c
com32/hdt/hdt-cli-vesa.c
com32/hdt/hdt-cli.c
com32/hdt/hdt-common.c
com32/hdt/hdt-menu-pci.c

com32/hdt/hdt-ata.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-pxe.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-vesa.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-common.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-common.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;