git://git.exim.org / users / jgh / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71da6ae cb46fd2)
Merge branch 'master' into transp_logging_1031
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 21 Jul 2013 16:15:21 +0000 (17:15 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 21 Jul 2013 16:15:21 +0000 (17:15 +0100)
Conflicts:
src/src/readconf.c

1  2 
src/src/exim.c patch | diff1 | diff2 | blob | history

diff --cc src/src/exim.c
Simple merge
Jeremy Harris' staging directory