diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:42:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:42:21 +0100 |
| commit | 0995bff5947340333466cf3ac9c6a6b403b32d18 (patch) | |
| tree | 0e19cbbd0f63005497b1dbe08779f2947b6eca22 /runtime/debug.c | |
| parent | c8ebe623376bc025bf166ec333ac874c215de816 (diff) | |
| parent | 76ded5e98bd51d5de306f21f8abd28ee3b006be2 (diff) | |
| download | rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.gz rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.bz2 rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.zip | |
Merge branch 'v4-stable' into 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'runtime/debug.c')
0 files changed, 0 insertions, 0 deletions