From 814d176b86ff826e4422ebe67f47e11450f270d5 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 23 Dec 2004 22:31:39 +0000
Subject: [PATCH] recent changes

and Merry Christmas!
---
 CHANGES       | 4 ++++
 RELEASE-NOTES | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index d45fa2f3c..4fb5e6b18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel (23 December 2004)
+- David Shaw fixed the configure --disable-[protocol] variables so that
+  curl-config --feature now works correctly!
+
 Daniel (22 December 2004)
 - Rune Kleveland fixed a minor memory leak for received cookies with the
   (rare) version attribute set.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f96b45507..6b1a59f80 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -14,7 +14,10 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
- o 
+ o minor memory leak when "version" is set in a cookie header
+ o curl-config --feature lists the disabled protocols properly
+ o builds fine on BeOS
+ o builds and runs fine on FreeBSD
 
 Other curl-related news since the previous public release: