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

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: faf8159 5b726dd)

author	H. Peter Anvin <hpa@zytor.com>
	Tue, 26 Apr 2011 08:18:18 +0000 (01:18 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 26 Apr 2011 08:18:18 +0000 (01:18 -0700)
commit	d5b9f24567a26562ec1822235cbd08256b96c335
tree	8e5a4c6245652d9b610c6308d3f505cdf9292919	tree \| snapshot
parent	faf815967c276bab95989d22a62b8378d7ebf6f3	commit \| diff
parent	5b726ddd81fd77947e126b14c84fb843b63544c5	commit \| diff

Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'

Resolved Conflicts:
com32/hdt/Makefile
com32/sysdump/Makefile

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

com32/gpllib/Makefile	diff1 \|	diff2 \|	blob \| history
com32/hdt/Makefile	diff1 \|	diff2 \|	blob \| history
com32/lib/Makefile	diff1 \|	diff2 \|	blob \| history
com32/libupload/Makefile	diff1 \|	\|	blob \| history
com32/libutil/Makefile	diff1 \|	diff2 \|	blob \| history
com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history
com32/sysdump/Makefile	diff1 \|	diff2 \|	blob \| history
core/Makefile	diff1 \|	diff2 \|	blob \| history
diag/geodsp/Makefile	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;