diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
commit | 2082d963975a88c8e4dee3a43b98d939f9a2323f (patch) | |
tree | 340aa3b7084ed619e994b8bed6edbe77e66c45b2 /configure.ac | |
parent | 9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff) | |
parent | fcc4d77dd371744530e46a29b7534e89cf8251c4 (diff) | |
download | rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.gz rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.xz rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 13ef63d0..d70e48b5 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],[3.19.11],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.19.12],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_HEADERS([config.h]) |