diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-17 07:53:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-17 07:53:29 +0200 |
| commit | 2285e8da87184d418f4b015f92a42b9914753498 (patch) | |
| tree | a0848ffc905effc72e286d473aba48d63f930d62 /plugins/omprog/omprog.c | |
| parent | 463e7cd2eaaafd7188335c52a8e032cd3ba0b31a (diff) | |
| parent | 77fd80604e723249e902019ef87f6e3a53282c28 (diff) | |
| download | rsyslog-2285e8da87184d418f4b015f92a42b9914753498.tar.gz rsyslog-2285e8da87184d418f4b015f92a42b9914753498.tar.bz2 rsyslog-2285e8da87184d418f4b015f92a42b9914753498.zip | |
Merge branch 'tmp' into v7-stable
Conflicts:
plugins/imjournal/imjournal.c
Diffstat (limited to 'plugins/omprog/omprog.c')
0 files changed, 0 insertions, 0 deletions