diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-10-29 16:26:53 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-10-29 16:26:53 +0100 |
| commit | 24413511d36dd6aeea564444ba2e4aede62c812a (patch) | |
| tree | 75f9bc0c5fdb33ef7d4df30c805b90783f83baaa /smtpd/queue_backend.c | |
| parent | move to new layout (diff) | |
| parent | misunderstanding, fix appropariately :) (diff) | |
| download | OpenSMTPD-24413511d36dd6aeea564444ba2e4aede62c812a.tar.xz OpenSMTPD-24413511d36dd6aeea564444ba2e4aede62c812a.zip | |
Merge branch 'master' into cvs
Conflicts:
smtpd/Makefile
smtpd/aliases.5
smtpd/aliases.c
smtpd/auth.c
smtpd/auth_bsd.c
smtpd/auth_pwd.c
smtpd/bounce.c
smtpd/compress_backend.c
smtpd/compress_gzip.c
smtpd/config.c
smtpd/control.c
smtpd/delivery.c
smtpd/delivery_filename.c
smtpd/delivery_maildir.c
smtpd/delivery_mbox.c
smtpd/delivery_mda.c
smtpd/dns.c
smtpd/enqueue.c
smtpd/envelope.c
smtpd/expand.c
smtpd/filter_api.c
smtpd/filter_api.h
smtpd/forward.5
smtpd/forward.c
smtpd/iobuf.c
smtpd/iobuf.h
smtpd/ioev.c
smtpd/ioev.h
smtpd/libsmtpdfilter/Makefile
smtpd/lka.c
smtpd/lka_session.c
smtpd/log.c
smtpd/log.h
smtpd/makemap.8
smtpd/makemap.c
smtpd/makemap/Makefile
smtpd/map.c
smtpd/map_db.c
smtpd/map_file.c
smtpd/map_static.c
smtpd/mda.c
smtpd/mfa.c
smtpd/mfa_session.c
smtpd/mta.c
smtpd/mta_session.c
smtpd/newaliases.8
smtpd/parse.y
smtpd/parser.c
smtpd/parser.h
smtpd/queue.c
smtpd/queue_backend.c
smtpd/queue_fsqueue.c
smtpd/ruleset.c
smtpd/scheduler.c
smtpd/scheduler_backend.c
smtpd/scheduler_ramqueue.c
smtpd/smtp.c
smtpd/smtp_session.c
smtpd/smtpctl.8
smtpd/smtpctl.c
smtpd/smtpctl/Makefile
smtpd/smtpd.8
smtpd/smtpd.c
smtpd/smtpd.conf.5
smtpd/smtpd.h
smtpd/smtpd/Makefile
smtpd/smtpfilter.c
smtpd/ssl.c
smtpd/ssl_privsep.c
smtpd/tree.c
smtpd/user.c
smtpd/user_pwd.c
smtpd/util.c
smtpd/waitq.c
Diffstat (limited to 'smtpd/queue_backend.c')
| -rw-r--r-- | smtpd/queue_backend.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/smtpd/queue_backend.c b/smtpd/queue_backend.c index 80c20b03..70a12580 100644 --- a/smtpd/queue_backend.c +++ b/smtpd/queue_backend.c @@ -1,4 +1,8 @@ +<<<<<<< HEAD /* $OpenBSD: queue_backend.c,v 1.38 2012/09/01 16:09:14 gilles Exp $ */ +======= +/* $OpenBSD: queue_backend.c,v 1.39 2012/10/09 13:39:00 eric Exp $ */ +>>>>>>> master /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> |