aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2002-01-05 22:22:39 +0000
committerhpa <hpa>2002-01-05 22:22:39 +0000
commit303adc96205cfa0930512d12573dccc697a9bd4c (patch)
tree7a634052f31d5b15b0345730f36ed1ef269267a3
parent21161046419ba49e2a247f9fe1231573318c37fc (diff)
downloadtftp-hpa-303adc96205cfa0930512d12573dccc697a9bd4c.tar.gz
Correct merge conflict.
-rw-r--r--CHANGES5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index b13387f..79eceb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,9 @@ $Id$
Changes in 0.29:
Posixly correctness.
- Now works on Win32 systems using Cygwin (see
- <http://www.cygwin.com/>).
+ Now compiles and runs on Win32 systems using Cygwin
+ (http://www.cygwin.com/).
+ (<http://www.cygwin.com/>).
Fixed a bug which could cause a standalone server to exit with
a "recvfrom: Interrupted system call" log message if signals