diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
commit | 060ea06c41012a00db17cfbd2cff5b2eade3eb51 (patch) | |
tree | d7759af829587dbd1a4b1de9745c5b3db0053bd7 /stringbuf.h | |
parent | 285444aa313454b09ad0cac1e29f326cd4373096 (diff) | |
parent | c574f90c450ece3e336612e232e464b7c8d08ab1 (diff) | |
download | rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.gz rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.bz2 rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.zip |
Merge branch 'beta'
Conflicts:
syslogd.c
Diffstat (limited to 'stringbuf.h')
0 files changed, 0 insertions, 0 deletions