diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:56:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:56:54 +0200 |
| commit | 272f0a5b3d285a1ecff01d216254c95863b0d444 (patch) | |
| tree | 8ee70648ac83411b221443902d9e8e18ce6a614f /action.c | |
| parent | e7701775553a60efb050b0df497bb4df5df46d62 (diff) | |
| parent | 16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a (diff) | |
| download | rsyslog-272f0a5b3d285a1ecff01d216254c95863b0d444.tar.gz rsyslog-272f0a5b3d285a1ecff01d216254c95863b0d444.tar.xz rsyslog-272f0a5b3d285a1ecff01d216254c95863b0d444.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/v6compatibility.html
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions