summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-11 18:22:19 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-11 18:22:19 +0200
commita88d7d29ee2b36827cb3b4df58e77f9ca439bcbc (patch)
tree7c1948376b317d01651fe2c86e44ae822523c2a1 /build
parent8d471ab9450d653dd40187f0476365cce0d3ce4f (diff)
parent3ebbb9c4bbfe5d4a815861afde28df47d35b022e (diff)
downloadrsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.zip
rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.gz
rsyslog-a88d7d29ee2b36827cb3b4df58e77f9ca439bcbc.tar.xz
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog
Diffstat (limited to 'build')
0 files changed, 0 insertions, 0 deletions