diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:14:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:14:56 +0200 |
| commit | 7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51 (patch) | |
| tree | 4395c114e4bbeb94cbed0f3c7177d148c179989c /java/com/rsyslog | |
| parent | c104eea4e5d0aeb4c87ee23fab8532530d5fe0e9 (diff) | |
| parent | 73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff) | |
| download | rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.tar.gz rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.tar.xz rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
plugins/imrelp/imrelp.c
Diffstat (limited to 'java/com/rsyslog')
0 files changed, 0 insertions, 0 deletions