diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2014-11-02 23:00:25 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2014-11-02 23:00:25 +0100 |
| commit | 425db78f0677dfa1740ce151202c7967ce9d6152 (patch) | |
| tree | b5539917f81e5572c108cbad91c39da9654012db /mk/smtpd | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | remove rfc822 parser (diff) | |
| download | OpenSMTPD-425db78f0677dfa1740ce151202c7967ce9d6152.tar.xz OpenSMTPD-425db78f0677dfa1740ce151202c7967ce9d6152.zip | |
Merge branch 'master' into portable
Conflicts:
smtpd/rfc822.c
Diffstat (limited to 'mk/smtpd')
| -rw-r--r-- | mk/smtpd/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mk/smtpd/Makefile.am b/mk/smtpd/Makefile.am index eda1843f..4df4bb21 100644 --- a/mk/smtpd/Makefile.am +++ b/mk/smtpd/Makefile.am @@ -43,7 +43,6 @@ smtpd_SOURCES+= $(smtpd_srcdir)/pony.c smtpd_SOURCES+= $(smtpd_srcdir)/queue.c smtpd_SOURCES+= $(smtpd_srcdir)/queue_backend.c smtpd_SOURCES+= $(smtpd_srcdir)/rfc2822.c -smtpd_SOURCES+= $(smtpd_srcdir)/rfc822.c smtpd_SOURCES+= $(smtpd_srcdir)/ruleset.c smtpd_SOURCES+= $(smtpd_srcdir)/runq.c smtpd_SOURCES+= $(smtpd_srcdir)/scheduler.c |