From: Bodo Möller <bodo@openssl.org>
Date: Mon, 25 Apr 2005 21:06:05 +0000 (+0000)
Subject: first step to melt down ChangeLog.0_9_7-stable_not-in-head :-)
X-Git-Tag: OpenSSL_0_9_8-beta1~13^2~143
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=aa16a28631a9a7acec12cb94189e5ad01c6dc927;ds=sidebyside

first step to melt down ChangeLog.0_9_7-stable_not-in-head :-)
---

diff --git a/CHANGES b/CHANGES
index 84b8efae2c..25b0b6b303 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.7f and 0.9.8  [xx XXX xxxx]
+ Changes between 0.9.7g and 0.9.8  [xx XXX xxxx]
 
   *) Add support for DER encoded private keys (SSL_FILETYPE_ASN1)
      to SSL_CTX_use_PrivateKey_file() and SSL_use_PrivateKey_file()
diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
index d99460a704..4455b0e9cf 100644
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -1,9 +1,15 @@
-2002-02-13 19:22  bodo
+This is a collection of those CVS change log entries for the 0.9.7
+branch (OpenSSL_0_9_7-stable) that do not appear similarly in
+0.9.8-dev (CVS head).
+    
+Some obvious false positives have been eliminated: e.g., we do not
+care about a simple "make update"; and we don't care about changes
+identified to the 0.9.7 branch that were explicitly identified as
+backports from head.
+    
+Eliminating all other entries (and finally this file), either as false
+positives or as things that should go into 0.9.8, remains to be done.
 
-	Changed:
-		README (1.39.2.1), "Exp", lines: +1 -1
-
-	it's year 2002 now
 
 2002-02-14 03:43  levitte
 
diff --git a/README b/README
index faebdf980e..4db0beb2ae 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
  OpenSSL 0.9.8-dev XX xxx XXXX
 
- Copyright (c) 1998-2002 The OpenSSL Project
+ Copyright (c) 1998-2005 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.