diff options
| author | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2009-11-16 10:36:06 +0000 |
|---|---|---|
| committer | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2009-11-16 10:36:06 +0000 |
| commit | 235864576279688ab7e191cdfc9e8533b6d75fe9 (patch) | |
| tree | 50ddc89cd789a8b7d288a621d7d2dcfd27f08b0c /doc | |
| parent | 0a6dda6bb64472e0027cb6b93ed43ba37c8c84af (diff) | |
| parent | 3369a18e1a3eae71a8b37bd91cff61dbbe389a2b (diff) | |
| download | syslinux-235864576279688ab7e191cdfc9e8533b6d75fe9.tar.gz | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/memdisk.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/memdisk.txt b/doc/memdisk.txt index 58ec748b..8a308f10 100644 --- a/doc/memdisk.txt +++ b/doc/memdisk.txt @@ -75,6 +75,7 @@ b) If the disk image is less than 4,194,304 bytes (4096K, 4 MB) it is s=# Specify number of sectors (max 63) floppy[=#] The image is a floppy image[**] harddisk[=#] The image is a hard disk image[**] + iso The image is an El Torito ISO9660 image (drive 0xE0) # represents a decimal number. |