consistency between main branch and stable branch

diff --git a/CHANGES b/CHANGES
index 69189fac8e3e63d4d06bfee91d83e5a9fac2063e..26cf061a6dc1287793e7feab05c0cbc3edf2e23c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1906,14 +1906,14 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      identity, and test if they are actually available.
      [Richard Levitte]
 
      identity, and test if they are actually available.
      [Richard Levitte]
 

-  +) Add support for shared libraries under Irix.
+  *) Add support for shared libraries under Irix.

      [Albert Chin-A-Young <china@thewrittenword.com>]
 
   +) Improve RPM specification file by forcing symbolic linking and making
      sure the installed documentation is also owned by root.root.
      [Damien Miller <djm@mindrot.org>]
 
      [Albert Chin-A-Young <china@thewrittenword.com>]
 
   +) Improve RPM specification file by forcing symbolic linking and making
      sure the installed documentation is also owned by root.root.
      [Damien Miller <djm@mindrot.org>]
 

-  +) Add configuration option to build on Linux on both big-endian and
+  *) Add configuration option to build on Linux on both big-endian and

      little-endian MIPS.
      [Ralf Baechle <ralf@uni-koblenz.de>]
 
      little-endian MIPS.
      [Ralf Baechle <ralf@uni-koblenz.de>]
 


@@ -1943,7 +1943,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   +) Support threads on FreeBSD-elf in Configure.
      [Richard Levitte]
 
   +) Support threads on FreeBSD-elf in Configure.
      [Richard Levitte]
 

-  +) Add the possibility to create shared libraries on HP-UX
+  *) Add the possibility to create shared libraries on HP-UX

      [Richard Levitte]
 
   +) Fix for SHA1 assembly problem with MASM: it produces
      [Richard Levitte]
 
   +) Fix for SHA1 assembly problem with MASM: it produces