summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hotmail.com>2001-12-26 12:48:12 +0000
committerRobert Collins <rbtcollins@hotmail.com>2001-12-26 12:48:12 +0000
commit028ee5466b3dcefe5bc15d6a3d66fe89a3d91aa0 (patch)
tree1bfbdb26bf17634c661ad2c36ed222d582364d4f /winsup
parentcbce49804fb7826fa532e0e4ddc2436fa3374a2b (diff)
downloadcygnal-028ee5466b3dcefe5bc15d6a3d66fe89a3d91aa0.tar.gz
cygnal-028ee5466b3dcefe5bc15d6a3d66fe89a3d91aa0.tar.bz2
cygnal-028ee5466b3dcefe5bc15d6a3d66fe89a3d91aa0.zip
Remove accenidentally left >>> marker
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 f700246b2..54c62f132 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -123,7 +123,6 @@
* net.cc (cygwin_getsockopt): Dereference optlen pointer when passing
to __check_null_invalid_struct_errno.
->>>>>>> 1.1060
2001-12-03 Christopher Faylor <cgf@redhat.com>
* net.cc (cygwin_getsockopt): Allow NULL optval.