summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
commit22328c72aef2df73741afefe0e8b53d3ad83f15d (patch)
tree4a0b311508ebb28a0dc72e12993f704c2709d46a /configure.ac
parentda933a7e105acf814d5e7955d39d29eab3a96613 (diff)
parent7c0ca7553738161c681c0d0600de99e9fabee81d (diff)
downloadrsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.xz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog runtime/datetime.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 598e4fa3..78556be6 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],[4.5.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.1.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_MACRO_DIR([m4])