git://git.exim.org / users / jgh / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 846726c 6822b90)
Merge branch 'master' of git://git.exim.org/exim
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 8 Jul 2012 21:53:30 +0000 (22:53 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 8 Jul 2012 21:53:30 +0000 (22:53 +0100)
1  2 
doc/doc-docbook/spec.xfpt patch | diff1 | diff2 | blob | history
doc/doc-txt/ChangeLog patch | diff1 | diff2 | blob | history
src/src/macros.h patch | diff1 | diff2 | blob | history

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