diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 09:41:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 09:41:40 +0200 |
| commit | 88154352094b2014bacaed2e5ee15c9b77ed19d5 (patch) | |
| tree | 7b604b598158fe446ec222a911a97df0a2487529 /runtime/rsconf.c | |
| parent | c0e35e864aebef9de367f736e8b73a3f3753c7f9 (diff) | |
| parent | e99ca8246fee02bb7f713f31527f2377a5d2dd5c (diff) | |
| download | rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.tar.gz rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.tar.xz rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/rsconf.c')
0 files changed, 0 insertions, 0 deletions