summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 47a7f6889..859a3327f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -54,7 +54,6 @@
2001-10-22 Corinna Vinschen <corinna@vinschen.de>
->>>>>>> 1.975
* net.cc (get_2k_ifconf): Change multiple IP address naming scheme
to Linux style.