OSDN Git Service
(root)
/
pf3gnuchains
/
sourceware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
805aef7
)
Remove merge conflict indicator.
author
cgf
<cgf>
Wed, 24 Oct 2001 15:40:24 +0000
(15:40 +0000)
committer
cgf
<cgf>
Wed, 24 Oct 2001 15:40:24 +0000
(15:40 +0000)
winsup/cygwin/ChangeLog
patch
|
blob
|
history
diff --git
a/winsup/cygwin/ChangeLog
b/winsup/cygwin/ChangeLog
index
47a7f68
..
859a332
100644
(file)
--- 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.