summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-07 14:33:37 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-07 14:33:37 +0200
commitbfc6f6d599a4723b26708da5fddcc6db5c53fc21 (patch)
tree6a316f837808e735790fced62a46142f4cf6b9e6 /configure.ac
parentda2039614ffd93b8fb1ebddf2ed3eb6dc873c1a5 (diff)
parenta192300aa26484c88aedd306fdb92d7752eee427 (diff)
downloadrsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.gz
rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.bz2
rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.zip
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts: 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 1200294b..b626da66 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.8-newstats11],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.8.9-newstats12],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])