summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-08-21 16:52:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-08-21 16:52:11 +0200
commit9c018b48a7f6bcc15193a2130312ee2678a0bb6a (patch)
tree711eb876ca0af51b3e130e1b000d09319845ffa7 /Makefile.am
parentcdb58f8d913dc47b01f61f5a72a83ce6aea26623 (diff)
parent5b08f0cbc3f73700f852a65ad5a3284c71265536 (diff)
downloadrsyslog-9c018b48a7f6bcc15193a2130312ee2678a0bb6a.tar.gz
rsyslog-9c018b48a7f6bcc15193a2130312ee2678a0bb6a.tar.xz
rsyslog-9c018b48a7f6bcc15193a2130312ee2678a0bb6a.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions