Correct merge conflict.

This commit is contained in:
hpa 2002-01-05 22:22:39 +00:00
parent 2116104641
commit 303adc9620

View file

@ -3,8 +3,9 @@ $Id$
Changes in 0.29: Changes in 0.29:
Posixly correctness. Posixly correctness.
Now works on Win32 systems using Cygwin (see Now compiles and runs on Win32 systems using Cygwin
<http://www.cygwin.com/>). (http://www.cygwin.com/).
(<http://www.cygwin.com/>).
Fixed a bug which could cause a standalone server to exit with Fixed a bug which could cause a standalone server to exit with
a "recvfrom: Interrupted system call" log message if signals a "recvfrom: Interrupted system call" log message if signals