diff options
| author | Erwan Velu <erwanaliasr1@gmail.com> | 2011-01-25 20:41:50 +0100 |
|---|---|---|
| committer | Erwan Velu <erwanaliasr1@gmail.com> | 2011-01-25 20:41:50 +0100 |
| commit | 995558ff657a357b3e44a299525ff66dbb0300b3 (patch) | |
| tree | b6caeafa866311926705b2eba695fbd699220f60 /com32/hdt/floppy | |
| parent | 2cb593ae927a80e856a255c9e484d16038033f62 (diff) | |
| parent | 808d43ea43c9df30a0a6922ef4cb4678634d41ab (diff) | |
| download | syslinux-995558ff657a357b3e44a299525ff66dbb0300b3.tar.gz | |
Merge branch 'master' into chouffe
Conflicts:
com32/hdt/hdt.h
Diffstat (limited to 'com32/hdt/floppy')
| -rw-r--r-- | com32/hdt/floppy/hdt.cfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/hdt/floppy/hdt.cfg b/com32/hdt/floppy/hdt.cfg index 27d11bac..1350521a 100644 --- a/com32/hdt/floppy/hdt.cfg +++ b/com32/hdt/floppy/hdt.cfg @@ -71,8 +71,8 @@ APPEND modules_pcimap=modules.pcimap modules_alias=modules.alias pciids=pci.ids MENU SEPARATOR LABEL memtest -MENU LABEL Memtest86+ 4.00 +MENU LABEL Memtest86+ 4.10 TEXT HELP - Starts Memtest86+ 4.00 + Starts Memtest86+ 4.10 ENDTEXT LINUX memtest.bin |