diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:46:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:46:59 +0200 |
| commit | 0b7eaa413a58aa3d92e9c4f384029c9393e00250 (patch) | |
| tree | d2b440a10c4fb468d9afbc548bbe74b842dac606 /configure.ac | |
| parent | 82c8077b91ab5c1928b3d712d3ab61e4041c461d (diff) | |
| parent | 84f7dd2bdc2356bdc9f5893a78adb4d00c21f750 (diff) | |
| download | rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.tar.gz rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.tar.xz rsyslog-0b7eaa413a58aa3d92e9c4f384029c9393e00250.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1504b025..d55cb93a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,8 @@ AC_PREREQ(2.61) AC_INIT([rsyslog],[3.17.5],[rsyslog@lists.adiscon.com]) +======= +AC_INIT([rsyslog],[3.16.3],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADERS([config.h]) |