summaryrefslogtreecommitdiffstats
path: root/stringbuf.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-07 12:53:12 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-07 12:53:12 +0200
commit2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (patch)
treeba1953678dcacb485e76f6df408b87e0c7e929b1 /stringbuf.h
parentc34ef852ee583de6e335f02d78f917b7d4da8062 (diff)
parent2f8fb81bd4cfcc69049b767139389af023d1eef6 (diff)
downloadrsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.gz
rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.bz2
rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog Makefile.am configure.ac doc/status.html rsyslog.conf.5 syslogd.c
Diffstat (limited to 'stringbuf.h')
-rw-r--r--[-rwxr-xr-x]stringbuf.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/stringbuf.h b/stringbuf.h
index aa31884e..aa31884e 100755..100644
--- a/stringbuf.h
+++ b/stringbuf.h