diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
| commit | 4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420 (patch) | |
| tree | 5fbce194ca939a2999ad944647dc67e5913b68ff /freebsd | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| parent | a9933094b20d70da1641d80bb723e2570b937c36 (diff) | |
| download | rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.gz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.xz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'freebsd')
0 files changed, 0 insertions, 0 deletions