summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:02:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:02:50 +0200
commit1a7bf0ceaa792c580a726db831c749b80376e243 (patch)
tree222e63ba69d6bc3b3e53713c6f19b259e0d01360 /configure.ac
parentd7bc0f1f1e81ca0fa678b945962574112df949bc (diff)
parenta61e548958044f9efa013b5911d130ae1930448f (diff)
downloadrsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.gz
rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.xz
rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.zip
Merge branch 'beta'
Conflicts: plugins/imuxsock/imuxsock.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions