summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-26 17:00:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-26 17:00:12 +0100
commit46ac70bb3073295f70bdddc8359d056bc0651909 (patch)
tree98b42b96616bc087980b0ddff9609f9174599d9e /configure.ac
parent3ab759c40d34f518744efa9b266640784fc3655f (diff)
parentb6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff)
downloadrsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.gz
rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.xz
rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.zip
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts: ChangeLog
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 64f4fdc8..cd33201a 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.6.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.6.2],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_MACRO_DIR([m4])