]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2829a93 c60d1fe)
Resolve conflicts with aviro changes.
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 28 Oct 2002 12:11:20 +0000 (04:11 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 28 Oct 2002 12:11:20 +0000 (04:11 -0800)

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