diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
commit | 9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch) | |
tree | 10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /configure.ac | |
parent | 5416a94bbe9a24ad9236755a9e21944685fc231b (diff) | |
parent | f7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff) | |
download | rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.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 e88e1ceb..4f964c56 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.1.2],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.1.3],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) |