diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:35:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-20 18:35:20 +0100 |
| commit | 22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd (patch) | |
| tree | 86bd79e8254879f6668152f25fd33b4bd7101d36 /action.c | |
| parent | 55db71963e312634f78c25b61dd4800036fe25f9 (diff) | |
| parent | af720e9f9dffa205cf4b323c2a420c1cca6ddc17 (diff) | |
| download | rsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.tar.gz rsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.tar.xz rsyslog-22b7ecfe76fefcbf7f911e8737d2c9fd55f60edd.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions