diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-16 11:01:41 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-16 11:01:41 +0200 |
| commit | 803462104b4eb319c05ea0f6e30c0b04548a1ed0 (patch) | |
| tree | 994e92fbcb18fa858ac712fd2219cfa57a9e51c7 /configure.ac | |
| parent | 1b9a4f303bd3e0cb899788e1a8908ea60e23eadd (diff) | |
| parent | 33bf53cdab0689bd7f100aca5f09dd6b69da0e94 (diff) | |
| download | rsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.tar.gz rsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.tar.xz rsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.zip | |
Merge branch 'v5-stable' into 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 1dd876ac..023a447c 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],[5.9.2],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.9.3-pre1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |