diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:35:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:35:09 +0100 |
| commit | fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf (patch) | |
| tree | 7347b2b968591f0c3e37b319fdd6ca9fe4ea5b3f /java | |
| parent | cc0da38a4becfd5a152438823437f671234e3a3b (diff) | |
| parent | 0871d0a077c8adfdda8f055e021239dc4f354f7e (diff) | |
| download | rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.tar.gz rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.tar.xz rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imtcp/imtcp.c
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions