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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e4fc443 dc81681)

author	H. Peter Anvin <hpa@zytor.com>
	Fri, 21 May 2010 03:32:21 +0000 (20:32 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Fri, 21 May 2010 03:32:21 +0000 (20:32 -0700)
commit	0d5516e0e0a50d618e4d5b5de171c7562a902588
tree	3fab36de6519048d480bcf31f0a23e1577a318a5	tree \| snapshot
parent	e4fc443f9b70f188963ff33e0a16ccb72a553540	commit \| diff
parent	dc81681f81225d6f22cc8e3afcf07a286e02ca62	commit \| diff

Merge remote branch 'origin/master' into pathbased

Resolved Conflicts:
com32/modules/cat.c

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

Domain: System / Base;