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

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 22411fa cf3ba28)

author	Michal Soltys <soltys@ziu.info>
	Wed, 4 May 2011 13:46:29 +0000 (15:46 +0200)
committer	Michal Soltys <soltys@ziu.info>
	Wed, 4 May 2011 13:46:29 +0000 (15:46 +0200)
commit	e4a46d8e86b3a14decc010d5cbd371922bdbb94b
tree	d58aabf4be68f2d83fad4252840cfb2888252f5b	tree \| snapshot
parent	22411fad71c8949dbbe5880ae8a65043ca858872	commit \| diff
parent	cf3ba289e440cc9e764243a02b8a474ebde70da7	commit \| diff

Merge branch 'master' into chaindev

Conflicts:
com32/Makefile
com32/modules/chain.c

Note: add ReactOS' stuff introduced in old chain.c

Signed-off-by: Michal Soltys <soltys@ziu.info>

Makefile	diff1 \|	diff2 \|	blob \| history
com32/Makefile	diff1 \|	diff2 \|	blob \| history
com32/chain/Makefile	diff1 \|	\|	blob \| history
com32/lib/Makefile	diff1 \|	diff2 \|	blob \| history
com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;