chiark / gitweb /
~ian / inn-innduct.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b227ef 902997d)
Merge branch 'master' of login.chiark.greenend.org.uk:public-git/inn-innduct
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Mon, 3 May 2010 13:43:01 +0000 (14:43 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Mon, 3 May 2010 13:43:01 +0000 (14:43 +0100)
Conflicts:

backends/innduct.c

1  2 
backends/innduct.c patch | diff1 | diff2 | blob | history

diff --cc backends/innduct.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.