summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-06 09:17:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-06 09:17:27 +0200
commitee403c2ad745039add6cd34ec1e9a55aa9d51160 (patch)
tree0d5a6f5463d91a7fa160532e2f3e094590ff4506 /configure.ac
parent06633d3fac69a3d380b36ce728a6f2278561b4bb (diff)
parentffdc33e3f178ad85ba5c2c9f7fcee98b743e9d5e (diff)
downloadrsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.gz
rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.xz
rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.zip
Merge branch 'v5-stable-imfile-batches' into v5-devel
Conflicts: ChangeLog configure.ac
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 fb0cff8d..1faaff89 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],[5.8.1-pre3],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.8.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])