diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-15 12:21:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-15 12:21:36 +0200 |
| commit | 1b9dffd5501807af9472a12c702aa582b23fca96 (patch) | |
| tree | 463bca514c2a51aaa9977ccc96b9fba7767ce7e1 /action.h | |
| parent | 41d8672524b93aaf7b7835336ac9b92428b90fed (diff) | |
| parent | a201de795ad630ddf81fea9f7bbb13ad79bdfff4 (diff) | |
| download | rsyslog-1b9dffd5501807af9472a12c702aa582b23fca96.tar.gz rsyslog-1b9dffd5501807af9472a12c702aa582b23fca96.tar.xz rsyslog-1b9dffd5501807af9472a12c702aa582b23fca96.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
doc/rsyslog_conf_global.html
Diffstat (limited to 'action.h')
0 files changed, 0 insertions, 0 deletions