diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:14:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:14:45 +0200 |
| commit | 4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8 (patch) | |
| tree | 1a36757788ca7394ae7cf257107e0bf1dcf6943b /runtime/stringbuf.h | |
| parent | 5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36 (diff) | |
| parent | eef1701be28f8f8b00134e6c20a8a493d0e69f80 (diff) | |
| download | rsyslog-4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8.tar.gz rsyslog-4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8.tar.xz rsyslog-4c44b1f2addb9ac6a3f0da2fde1261e8e49fe1d8.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/stringbuf.h')
0 files changed, 0 insertions, 0 deletions