diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-22 17:15:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-22 17:15:43 +0200 |
| commit | 2e6c5633a39357c84f769196e823004ee354f2fc (patch) | |
| tree | df5a3d253e2a6e2ef3558ea59be529e0910874c3 /configure.ac | |
| parent | c8d66987a2aff47d5cd8d1dc811893ce91c8410d (diff) | |
| parent | d7f26ff418237415834f5c34d10de120e16dc721 (diff) | |
| download | rsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.tar.gz rsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.tar.xz rsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions