From ce1a58414aa7177e71a4279cfc650610a3ec64b6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 5 Jun 2009 06:19:29 +0000 Subject: remove conflict markers --- CHANGES | 3 --- RELEASE-NOTES | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 1c9745a3d..61eeb0f9a 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,6 @@ Changelog -<<<<<<< CHANGES Daniel Stenberg (4 June 2009) - Setting the Content-Length: header from your app when you do a POST or PUT is almost always a VERY BAD IDEA. Yet there are still apps out there doing @@ -17,13 +16,11 @@ Daniel Stenberg (4 June 2009) wouldn't send. Aaron Oneal reported this problem in bug report #2799008 http://curl.haxx.se/bug/view.cgi?id=2799008) and helped us verify the fix. -======= Yang Tse (4 Jun 2009) - Igor Novoseltsev provided patches and information, that after some adjustments to better fit curl's way of doing things, have resulted in the posibility of building libcurl for VxWorks. ->>>>>>> 1.1683 Daniel Fandrich (2 June 2009) - Checked in a Google Android make file. To use it, you must first create a config.h file by running configure in the Android environment, diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 9866e5d92..af885c896 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,11 +20,8 @@ This release includes the following bugfixes: o libcurl-NSS build fixes o libcurl-NSS build fix o configure script fixed for VMS -<<<<<<< RELEASE-NOTES o set Content-Length: with POST and PUT failed with NTLM auth -======= o allow building libcurl for VxWorks ->>>>>>> 1.1030 This release includes the following known bugs: @@ -33,13 +30,8 @@ This release includes the following known bugs: This release would not have looked like this without help, code, reports and advice from friends like these: -<<<<<<< RELEASE-NOTES Yang Tse, Daniel Fandrich, Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet, Mike Crowe, Claes Jakobsson, John E. Malmberg, - Aaron Oneal -======= - Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet, - Mike Crowe, Claes Jakobsson, John E. Malmberg, Igor Novoseltsev ->>>>>>> 1.1030 + Aaron Oneal, Igor Novoseltsev Thanks! (and sorry if I forgot to mention someone) -- cgit v1.2.3