diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:59:37 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:59:37 +0100 |
| commit | e02b553e1fdca5a655a58d03066cfbc4ab41bc85 (patch) | |
| tree | 271518077688e126db7267935983e1ab216474d5 /configure.ac | |
| parent | c5bfd2b24ca8c490401a0835ec741c05acf0ed3e (diff) | |
| parent | a453c7d858779736621c336bc1973bbaf6d6d87a (diff) | |
| download | rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.gz rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.xz rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf.html
plugins/imudp/imudp.c
runtime/rsyslog.h
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 8eecf2ab..e8aa644a 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.1.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.1.2],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_HEADERS([config.h]) |