From: Bodo Möller <bodo@openssl.org>
Date: Sun, 14 Sep 2008 13:53:18 +0000 (+0000)
Subject: Note about CVS branch inconsistency.
X-Git-Tag: OpenSSL_0_9_8k^2~255
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e710de12ce27e5f1620eee974b1a45cfb7139ada;p=oweals%2Fopenssl.git

Note about CVS branch inconsistency.
---

diff --git a/CHANGES b/CHANGES
index 4fd140968d..41e23dc9ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -749,9 +749,11 @@
      This work was sponsored by Logica.
      [Steve Henson]
 
+>>> Note: this change doesn't apply to the 0.9.9-dev branch (yet).
   *) Allow engines to be "soft loaded" - i.e. optionally don't die if
      the load fails. Useful for distros.
      [Ben Laurie and the FreeBSD team]
+<<<
 
  Changes between 0.9.8g and 0.9.8h  [28 May 2008]