diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:06:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:06:40 +0200 |
| commit | d30526568c77ceddedd47dd0c309c2224bb74ba0 (patch) | |
| tree | 97cb544c815fc5f91846a9ef4fb0109513efccbc /action.c | |
| parent | e6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (diff) | |
| parent | 73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff) | |
| download | rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.gz rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.xz rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.zip | |
Merge branch 'v3-stable' into v4-beta
Conflicts:
plugins/imrelp/imrelp.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions