]> git.neil.brown.name Git - history.git/commit
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)
commit6fee4e4eae95a053b1148537c1fe1ee9ff3d7a45
treefea61da3aecfaa64c024bea99e9216039d61fc5a
parent58af6e3af0578edece898ea59261812bad7a3576
parenta1bafab5cbe2ce874fe5b0e012cc9ab74a672b39
Resolve conflicts in ipconfig.c changes.