summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-20 11:36:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-20 11:36:22 +0200
commit1d86889922cb9232819b4451afce091e8a0ad938 (patch)
tree4a4229a103e4ff24ade50fff34f5e9d1e7cfa373 /Makefile.am
parentc399118345dff8568613133054e98ddf46d67aa5 (diff)
parentf847c2dda32488034f252e3bbd1a267714b99ff0 (diff)
downloadrsyslog-1d86889922cb9232819b4451afce091e8a0ad938.tar.gz
rsyslog-1d86889922cb9232819b4451afce091e8a0ad938.tar.xz
rsyslog-1d86889922cb9232819b4451afce091e8a0ad938.zip
Merge branch 'v4-stable' into v5-stable
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions