diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-09-08 13:38:02 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-09-08 13:38:02 +0200 |
| commit | 304ab88dd64b2ae46554fa5394aa8822194b1e95 (patch) | |
| tree | 9185445b00199c1f486bcca51fddd6b252bf8dd3 /configure.ac | |
| parent | d25f7d99f587ea20eb8d39ff6e2cffb6bdbc1c62 (diff) | |
| parent | 947e5632039d1dd2ef3ae22ac45b17370bbac24d (diff) | |
| download | rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.gz rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.xz rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
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 87d9d2f7..b79a62d6 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],[6.1.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.1.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |