diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
| commit | ec339c909734759e957065d00848abfcdfdfaf8f (patch) | |
| tree | 6c04178f35c7990af56fb74194b491ce91c51e47 /action.h | |
| parent | 9d98af3407423e723c114f009bd0915099580b6e (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.gz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.xz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/cfsysline.c
tools/ompipe.c
Diffstat (limited to 'action.h')
0 files changed, 0 insertions, 0 deletions