diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 12:13:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 12:13:26 +0200 |
| commit | 2716bc9ffc0b667ce63ea7407b6ca7742bf168ec (patch) | |
| tree | 00d4724a4b684b682beaf429a280613e5a0a5cd2 /doc/queue_msg_state.jpeg | |
| parent | 63daa0385cfe4c2999a32c62ff90e9b6e3c1f44e (diff) | |
| parent | 539f33c6a064b8c28cbb318e856dc50c213fd844 (diff) | |
| download | rsyslog-2716bc9ffc0b667ce63ea7407b6ca7742bf168ec.tar.gz rsyslog-2716bc9ffc0b667ce63ea7407b6ca7742bf168ec.tar.xz rsyslog-2716bc9ffc0b667ce63ea7407b6ca7742bf168ec.zip | |
Merge branch 'master' into v5-devel
IMPORTANT: this merge did NOT include the (important) changes
to action.c . Consolidating them was too hard (aka "error-prone")
because of the large differences in the code base. The fixes will
be redone with a later commit.
Conflicts:
action.c
configure.ac
doc/manual.html
Diffstat (limited to 'doc/queue_msg_state.jpeg')
0 files changed, 0 insertions, 0 deletions