diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 14:53:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 14:53:22 +0200 |
| commit | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (patch) | |
| tree | 8e93dffd3eff113cc05537d9699d5065dcb06ee4 /runtime/conf.c | |
| parent | 26a668f8fa352e63aefcc762eadd123002b3895d (diff) | |
| parent | 943a2070a6f556c48a903d55da0317b5942a41b6 (diff) | |
| download | rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.gz rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.bz2 rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/conf.c')
0 files changed, 0 insertions, 0 deletions