diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
| commit | 829385ce407433af0f7679eedb09357ad4055f2e (patch) | |
| tree | 62e9576f42154c5ed29eb3a6c868a08e066e9f6f /configure.ac | |
| parent | 010060289a729dd930ac04b72237f0ca0db9ea1d (diff) | |
| parent | 0550512b28049c391be424ad518ed0debb77089e (diff) | |
| download | rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.gz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.xz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf.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 de328f83..32b27483 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.5],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.1.6],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) |