summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/texts/alpha/RELNOTES.TXT2
-rw-r--r--release/texts/i386/RELNOTES.TXT2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 920023c..ff8e1c0 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -85,7 +85,7 @@ DP83815 chipset, including the NetGear FA312-TX.
cdcontrol(1) now supports a "cdid" command, which calculates and
displays the CD serial number, using the same algorithm used by the CDDB
-database.
+database. [MERGED]
mtree(8) now includes support for a file listing pathnames to be excluded
when creating and verifying prototypes. This makes it easier to use
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index ffc1918..11d795e 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -89,7 +89,7 @@ DP83815 chipset, including the NetGear FA312-TX.
cdcontrol(1) now supports a "cdid" command, which calculates and
displays the CD serial number, using the same algorithm used by the CDDB
-database.
+database. [MERGED]
mtree(8) now includes support for a file listing pathnames to be excluded
when creating and verifying prototypes. This makes it easier to use
OpenPOWER on IntegriCloud