summaryrefslogtreecommitdiffstats
path: root/plugins/imrelp/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-16 13:46:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-16 13:46:09 +0200
commited96dda6449897ac62e133471fb084b1fe84812b (patch)
tree4531a1c5b466f7202a0eaa2f338069614298e8dd /plugins/imrelp/Makefile.am
parent09afe64f29bae5af8ea1749373e8c8b6586b70d1 (diff)
parent09a3d4ef122288c47a8390a2ce61322bde65c780 (diff)
downloadrsyslog-ed96dda6449897ac62e133471fb084b1fe84812b.tar.gz
rsyslog-ed96dda6449897ac62e133471fb084b1fe84812b.tar.xz
rsyslog-ed96dda6449897ac62e133471fb084b1fe84812b.zip
Merge branch 'beta'
Conflicts: ChangeLog rfc3195d.c
Diffstat (limited to 'plugins/imrelp/Makefile.am')
0 files changed, 0 insertions, 0 deletions