diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-07 10:18:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-07 10:18:31 +0200 |
| commit | b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85 (patch) | |
| tree | 0b66cbb98ef49b4be716ce630cde258a96233eb5 /configure.ac | |
| parent | e39f202c75af187f96a1af07e60892a63e45cd3f (diff) | |
| parent | 6f75d5460b12d6f57b3671d71d889747da0074cc (diff) | |
| download | rsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.tar.gz rsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.tar.xz rsyslog-b761fbb0f0c9d5cf253ad3f58f7d8486b5650e85.zip | |
Merge branch 'v2-stable' into v3-stable
Conflicts:
ChangeLog
doc/manual.html
doc/rsyslog_conf.html
omfwd.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions