recent fixes

2 files changed, 11 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 3a9e2c46a..b0b027589 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,10 +7,16 @@
                                   Changelog
 
 Daniel (16 August 2004)
+- libcurl now allows a custom "Accept-Encoding:" header override the
+  internally set one that gets set with CURLOPT_ENCODING. Pointed out by Alex.
+
 - Roland Krikava found and fixed a cookie problem when using a proxy (the
   path matching was wrong). I added test case 179 to verify that we now do
   right.
 
+Daniel (15 August 2004)
+- Casey O'Donnell fixed some MSVC makefile targets to link properly.
+
 Daniel (11 August 2004)
 - configure now defines _XOPEN_SOURCE to 500 on systems that need it to build
   warning-free (the only known one so far is non-gcc builds on 64bit SGI
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7e0c15b92..527af2075 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -14,14 +14,17 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
- o 
+ o cookies over proxy didn't match the path properly
+ o MSVC makefile fixes to build better
+ o FTP response 530 on 'PASS' now sends back a better error message
 
 Other curl-related news since the previous public release:
 
- o 
+ o pycurl version 7.12.1 http://pycurl.sourceforge.net/
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
+ Casey O'Donnell, Roland Krikava, Alex
 
         Thanks! (and sorry if I forgot to mention someone)