git://git.exim.org / users / jgh / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2af03f 578897e)
Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Wed, 30 Apr 2014 00:07:04 +0000 (17:07 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 30 Apr 2014 00:07:04 +0000 (17:07 -0700)
1  2 
doc/doc-docbook/spec.xfpt patch | diff1 | diff2 | blob | history
doc/doc-txt/ChangeLog patch | diff1 | diff2 | blob | history

diff --cc doc/doc-docbook/spec.xfpt
Simple merge
diff --cc doc/doc-txt/ChangeLog
Simple merge
Jeremy Harris' staging directory