diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
| commit | a6c743e5ec5d213d3aa6404553fe65d59f065799 (patch) | |
| tree | 8ec5ec4d77dea8a12280b965c2c5ba7f5051158f /configure.ac | |
| parent | 7db9f96fe9ecb9f8e05d45cc888aa488d8aed85f (diff) | |
| parent | 845c6f59b91e9988f856556cbb0e88e275e8e591 (diff) | |
| download | rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.gz rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.xz rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
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]) |