]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58af6e3 a1bafab)
Resolve conflicts in ipconfig.c changes.
authorDavid S. Miller <davem@nuts.ninka.net>
Tue, 8 Jul 2003 11:24:04 +0000 (04:24 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Tue, 8 Jul 2003 11:24:04 +0000 (04:24 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.