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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1febc79 244d2fe)

author	H. Peter Anvin <hpa@zytor.com>
	Thu, 10 Jan 2008 19:16:16 +0000 (11:16 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 10 Jan 2008 19:16:16 +0000 (11:16 -0800)
commit	c072d12df4b43aef3375c190358da4928a0c2a1e
tree	0305c03bf1426b0368662eefddb6758c539d80ed	tree \| snapshot
parent	1febc7936ec9c3f139d6ed993d4ec13b63c81f80	commit \| diff
parent	244d2fe917cec1565b4fd992ea9e8cc46749a661	commit \| diff

Merge commit 'origin/master' into adv

Conflicts:

extlinux/extlinux.c

19 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
bin2c.pl	diff1 \|	diff2 \|	blob \| history
com32/include/syslinux/adv.h	diff1 \|	\|	blob \| history
com32/include/syslinux/advconst.h	diff1 \|	\|	blob \| history
com32/lib/syslinux/adv.c	diff1 \|	\|	blob \| history
com32/lib/syslinux/advwrite.c	diff1 \|	\|	blob \| history
com32/lib/syslinux/getadv.c	diff1 \|	\|	blob \| history
com32/lib/syslinux/setadv.c	diff1 \|	\|	blob \| history
com32/samples/Makefile	diff1 \|	diff2 \|	blob \| history
com32/samples/advdump.c	diff1 \|	\|	blob \| history
comboot.inc	diff1 \|	diff2 \|	blob \| history
extlinux/extlinux.c	diff1 \|	diff2 \|	blob \| history
layout.inc	diff1 \|	diff2 \|	blob \| history
libinstaller/setadv.c	diff1 \|	\|	blob \| history
libinstaller/syslinux.h	diff1 \|	diff2 \|	blob \| history
libinstaller/syslxint.h	diff1 \|	\|	blob \| history
libinstaller/syslxmod.c	diff1 \|	diff2 \|	blob \| history
ui.inc	diff1 \|	diff2 \|	blob \| history
win32/Makefile	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;