diff options
author | Gilles Chehade <gilles@poolp.org> | 2013-03-20 12:18:38 +0100 |
---|---|---|
committer | Gilles Chehade <gilles@poolp.org> | 2013-03-20 12:18:38 +0100 |
commit | 172d1e67fcaf5abf57c553aa3ddf324303d847c1 (patch) | |
tree | 1debd248f36729734247d6a8c71a889079757ad2 | |
parent | missing from previous merge (diff) | |
parent | update version (diff) | |
download | OpenSMTPD-172d1e67fcaf5abf57c553aa3ddf324303d847c1.tar.xz OpenSMTPD-172d1e67fcaf5abf57c553aa3ddf324303d847c1.zip |
Merge branch 'master' into portableopensmtpd-201303201252p1
Conflicts:
publish.sh
-rwxr-xr-x | publish.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ esac # build_tarball() { - V=5.3 + V=5.3.x P=p1 ASRSRC=/usr/src/lib/libc/asr ASRFILES="asr.c asr_debug.c asr_utils.c gethostnamadr_async.c |