summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-02 12:03:32 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-02 12:03:32 +0200
commit25bc87872aabe03b35ca81f6be069b686e6a8435 (patch)
tree8d5f2f98e191857e8e04cd816ee96de6a38e8629 /README
parent1a9ac0ced72dd163228438af4f31f233fab20529 (diff)
parent2082d963975a88c8e4dee3a43b98d939f9a2323f (diff)
downloadrsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.tar.gz
rsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.tar.xz
rsyslog-25bc87872aabe03b35ca81f6be069b686e6a8435.zip
Merge branch 'beta'
Conflicts: ChangeLog action.c configure.ac doc/manual.html
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions