diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:07:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:07:47 +0100 |
| commit | e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be (patch) | |
| tree | fd166a50fb1f6e3e59c4b16b80f29850fb13b6c1 /java/com/rsyslog/lib/SyslogSender.java | |
| parent | 7bccae395b83416be6bea2de69fdfcce46995acf (diff) | |
| parent | dfa88369d4ca4290db56b843f9eabdae1bfe0fd5 (diff) | |
| download | rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.tar.gz rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.tar.xz rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
Diffstat (limited to 'java/com/rsyslog/lib/SyslogSender.java')
0 files changed, 0 insertions, 0 deletions