summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-06-16 12:01:40 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-06-16 12:01:40 +0200
commitd1c7f2c69afea3bd6dd242c5dd9acca4d09726a4 (patch)
tree4685d469de581908b6609e720e983a2a5366b83b /.gitignore
parent33e2d8063277d887f4a1b8f6929c0dfa0eadd955 (diff)
parentd040868f97fa92f1df31b2ac7ff835dc4f3c29be (diff)
downloadrsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.tar.gz
rsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.tar.xz
rsyslog-d1c7f2c69afea3bd6dd242c5dd9acca4d09726a4.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions