summaryrefslogtreecommitdiffstats
path: root/net.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-09 18:10:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-09 18:10:39 +0200
commit0f3dbecb867bc8ed852389ae9642be5d0f3636aa (patch)
treed7389269cff2682c340bc750ce454a922a66fba3 /net.c
parentc574f90c450ece3e336612e232e464b7c8d08ab1 (diff)
parent3853f06d948703f6a28fa6a131ea04521543d011 (diff)
downloadrsyslog-0f3dbecb867bc8ed852389ae9642be5d0f3636aa.tar.gz
rsyslog-0f3dbecb867bc8ed852389ae9642be5d0f3636aa.tar.xz
rsyslog-0f3dbecb867bc8ed852389ae9642be5d0f3636aa.zip
Merge branch 'v3-stable' into beta
Conflicts: modules.c
Diffstat (limited to 'net.c')
0 files changed, 0 insertions, 0 deletions