From: Bodo Möller <bodo@openssl.org>
Date: Thu, 22 Mar 2001 14:56:55 +0000 (+0000)
Subject: Add another "[This change does not apply to 0.9.7.]" line so
X-Git-Tag: OpenSSL_0_9_6a-beta3~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea09a504ef9784d0932bfb2758156eceb171afad;p=oweals%2Fopenssl.git

Add another "[This change does not apply to 0.9.7.]" line so
that we can combine the CHANGES files later on.
---

diff --git a/CHANGES b/CHANGES
index a3b7e529da..fe3daef2bd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
   *) Fix PKCS#7 decode routines so they correctly update the length
      after reading an EOC for the EXPLICIT tag.
      [Steve Henson]
+     [This change does not apply to 0.9.7.]
 
   *) Fix bug in PKCS#12 key generation routines. This was triggered
      if a 3DES key was generated with a 0 initial byte. Include