diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:02:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:02:50 +0200 |
| commit | 1a7bf0ceaa792c580a726db831c749b80376e243 (patch) | |
| tree | 222e63ba69d6bc3b3e53713c6f19b259e0d01360 /configure.ac | |
| parent | d7bc0f1f1e81ca0fa678b945962574112df949bc (diff) | |
| parent | a61e548958044f9efa013b5911d130ae1930448f (diff) | |
| download | rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.gz rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.bz2 rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.zip | |
Merge branch 'beta'
Conflicts:
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions