aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-01-24 17:17:18 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-01-24 17:17:18 +0000
commitfb07259e0d430aef27c346ee7c63a96adcce9900 (patch)
tree87fe41cf8dcfc1638bd062182b20ccff06d1e852
parent9d28a0252cc492e2908130fbf9b0175057bbc375 (diff)
and Igor Franchuk is his name!
-rw-r--r--CHANGES7
-rw-r--r--RELEASE-NOTES2
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index fb299037b..939f58ce5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,16 +6,13 @@
Changelog
-<<<<<<< CHANGES
Daniel S (23 Jan 2008)
-- "Igor" pointed out that CURLOPT_COOKIELIST set to "ALL" leaked memory, and so
- did "SESS". Fixed now.
+- Igor Franchuk pointed out that CURLOPT_COOKIELIST set to "ALL" leaked
+ memory, and so did "SESS". Fixed now.
-=======
Yang Tse (22 Jan 2008)
- Check poll.h at configuration time, and use it when sys/poll.h unavailable
->>>>>>> 1.1234
Daniel S (22 Jan 2008)
- Dmitry Kurochkin removed the cancelled state for pipelining, as we agreed
that it is bad anyway. Starting now, removing a handle that is in used in a
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ae8b86b4d..4cce7aa14 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -86,6 +86,6 @@ advice from friends like these:
Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,
Daniel Egger, Jeff Johnson, Nikitinskit Dmitriy, Georg Lippitsch, Eric Landes,
- Joe Malicki, Nathan Coulter, Lau Hang Kin, Judson Bishop
+ Joe Malicki, Nathan Coulter, Lau Hang Kin, Judson Bishop, Igor Franchuk
Thanks! (and sorry if I forgot to mention someone)