diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:41:22 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-18 15:41:22 +0200 |
| commit | 53135efb4e793da3eb94d9e42c340484192aefcf (patch) | |
| tree | 804f0b982ec849c8b0b128be8847e722ecfa5694 /configure.ac | |
| parent | 803462104b4eb319c05ea0f6e30c0b04548a1ed0 (diff) | |
| parent | 154747929f87010b444af2d552f980daafe451e6 (diff) | |
| download | rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.gz rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.xz rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
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 023a447c..5d6fe7d7 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.3-pre1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.9.3-pre2],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |