aboutsummaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES7
1 files changed, 2 insertions, 5 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