diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:40:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:40:18 +0200 |
| commit | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (patch) | |
| tree | aaba2a10abbd8c2e4210c6441e79c33d9362ae48 /action.c | |
| parent | 676939f61671f96e80323cf929ee506f3844fcfc (diff) | |
| parent | ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (diff) | |
| download | rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.tar.gz rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.tar.xz rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions