| commit | 235864576279688ab7e191cdfc9e8533b6d75fe9 | [log] [tgz] |
|---|---|---|
| author | Shao Miller <shao.miller@yrdsb.edu.on.ca> | Mon Nov 16 10:36:06 2009 +0000 |
| committer | Shao Miller <shao.miller@yrdsb.edu.on.ca> | Mon Nov 16 10:36:06 2009 +0000 |
| tree | 50ddc89cd789a8b7d288a621d7d2dcfd27f08b0c | |
| parent | 0a6dda6bb64472e0027cb6b93ed43ba37c8c84af [diff] | |
| parent | 3369a18e1a3eae71a8b37bd91cff61dbbe389a2b [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