diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:36:13 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:36:13 +0200 |
commit | 6bc629021eb008e1d48627bdac70b1c8b237937b (patch) | |
tree | ba46a74eeb318ea266061bdbcd382f9752453931 /configure.ac | |
parent | 5fa3c34a1fe0144a2d8cb74cb82a73d8c61d435d (diff) | |
parent | f4ec11fa779e7348f68ece1b3b50d499a0526ace (diff) | |
download | rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.tar.gz rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.tar.xz rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.zip |
Merge branch 'v5-beta' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions