]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9d077d 339d35f)
Hand resolve of minor conflicts.
authorDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 11:08:04 +0000 (04:08 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Fri, 18 Oct 2002 11:08:04 +0000 (04:08 -0700)

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