diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-01 12:22:36 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-01 12:22:36 +0100 |
| commit | 7974621502ae249a5e393dafb4f69895851b4014 (patch) | |
| tree | 762a57f0f6e25d85dc1c8af2e2f553f1060b70e3 /solaris | |
| parent | d2b7a55b04b24bff278953240754cc688a32f6b8 (diff) | |
| parent | a1f4330a7b1ab426d7abeeacb4ff4e5994c429e6 (diff) | |
| download | rsyslog-7974621502ae249a5e393dafb4f69895851b4014.tar.gz rsyslog-7974621502ae249a5e393dafb4f69895851b4014.tar.xz rsyslog-7974621502ae249a5e393dafb4f69895851b4014.zip | |
Merge branch 'v5-devel'
Conflicts:
plugins/imfile/imfile.c
plugins/imudp/imudp.c
plugins/ommysql/ommysql.c
Diffstat (limited to 'solaris')
0 files changed, 0 insertions, 0 deletions