Public Git Hosting - hdt-cyring.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 0a6dda6 3369a18)

commit	235864576279688ab7e191cdfc9e8533b6d75fe9
author	Shao Miller <shao.miller@yrdsb.edu.on.ca>
	Mon, 16 Nov 2009 10:36:06 +0000 (16 10:36 +0000)
committer	Shao Miller <shao.miller@yrdsb.edu.on.ca>
	Mon, 16 Nov 2009 10:36:06 +0000 (16 10:36 +0000)
tree	50ddc89cd789a8b7d288a621d7d2dcfd27f08b0c	tree \| snapshot (tar.gz zip)
parent	0a6dda6bb64472e0027cb6b93ed43ba37c8c84af	commit \| diff
parent	3369a18e1a3eae71a8b37bd91cff61dbbe389a2b	commit \| diff

Merge branch 'memdisk-iso-SAFE' into memdisk-iso

Conflicts:

memdisk/memdisk_chs.asm
memdisk/memdisk_edd.asm
memdisk/setup.c

Resolved:

Deleted memdisk/memdisk_chs.asm
Deleted memdisk/memdisk_edd.asm
Modified memdisk/setup.c

doc/memdisk.txt	diff1 \|	diff2 \|	blob \| history
memdisk/Makefile	diff1 \|	diff2 \|	blob \| history
memdisk/memdisk_chs_512.asm	\|	diff2 \|	blob \| history
memdisk/memdisk_edd_512.asm	\|	diff2 \|	blob \| history
memdisk/memdisk_iso_2048.asm	\|	diff2 \|	blob \| history
memdisk/memdisk_iso_512.asm	\|	diff2 \|	blob \| history
memdisk/setup.c	diff1 \|	diff2 \|	blob \| history