summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-08-24 15:40:05 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-24 15:40:05 -0700
commite5fb1e90d8bc5702095a06db47227b6df2e9945f (patch)
treec05ec889219b046452bd6b9b2b680443d0791c9e /NEWS
parentdadc0999025959b1bb99846cf576ca8e10a15c72 (diff)
parente3f4df5bf10f5a64cfffdaa4f40a3960bd98cb95 (diff)
downloadsyslinux-e5fb1e90d8bc5702095a06db47227b6df2e9945f.tar.gz
Merge remote-tracking branch 'sha0/ifmemdsk'
Conflicts: NEWS
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS1
1 files changed, 1 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 295fa431..225ad72b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Changes in 4.05:
totally broken since 4.00 at least. Use MEMDISK instead.
* chain.c32: Support chaining ReactOS' FreeLdr (Shao Miller)
* isohybrid: -m option to add support for Mac EFI booting.
+ * ifmemdsk.c32: Choose boot option based on presence of MEMDISK
Changes in 4.04:
* PXELINUX: Fix handling of unqualified DNS names.