summaryrefslogtreecommitdiffstats
path: root/plugins/imkmsg
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-01-11 09:39:27 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-01-11 09:39:27 +0100
commitf373968c665e74c3d4dd433ab532ca0630dcd89a (patch)
tree2cf629b014f3995866205438fbc69506b0e74938 /plugins/imkmsg
parent60ff99d276af30044b1d2295ecb2c4fcb9ae10d8 (diff)
parent25dd212bd0bbd68edf774221429bc59001794a7e (diff)
downloadrsyslog-f373968c665e74c3d4dd433ab532ca0630dcd89a.tar.gz
rsyslog-f373968c665e74c3d4dd433ab532ca0630dcd89a.tar.bz2
rsyslog-f373968c665e74c3d4dd433ab532ca0630dcd89a.zip
Merge branch 'v7-stable-libnet-frag'
Conflicts: ChangeLog configure.ac tools/omfile.c
Diffstat (limited to 'plugins/imkmsg')
0 files changed, 0 insertions, 0 deletions