summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-12 15:11:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-12 15:11:50 +0200
commit7177afe484e5ded6b0d65d19e18489cdacfeb0fa (patch)
tree721b623150baa67e9254d9176eac04773a395e9b /configure.ac
parente2978cd396551280274bd7a17ec3034e4a0dab9e (diff)
parent80d62d6bb7fe19c50f10732f98c8de90094845b0 (diff)
downloadrsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.zip
rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.gz
rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.xz
Merge branch 'v5-beta'
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 8642da2..94d43d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[6.3.7-tmp1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.3.8],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])