diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-09 13:00:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-09 13:00:56 +0200 |
| commit | 8f0a8076cc8194036dbd4edca1c2c30a7822dd09 (patch) | |
| tree | a7fd5bacf8d80fff628421186662d91705bdb8f1 /tests/rt-init.c | |
| parent | c1e3a032b447487ced9873b98a015046778d2b04 (diff) | |
| parent | 87a957b0f5686ec3a50c98f3d1cf3019b636e700 (diff) | |
| download | rsyslog-8f0a8076cc8194036dbd4edca1c2c30a7822dd09.tar.gz rsyslog-8f0a8076cc8194036dbd4edca1c2c30a7822dd09.tar.bz2 rsyslog-8f0a8076cc8194036dbd4edca1c2c30a7822dd09.zip | |
Merge branch 'beta' into master
Conflicts:
ChangeLog
configure.ac
plugins/imudp/imudp.c
runtime/stream.h
tests/Makefile.am
tests/diag.sh
tools/omfile.c
Diffstat (limited to 'tests/rt-init.c')
| -rw-r--r-- | tests/rt-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rt-init.c b/tests/rt-init.c index 66a9ad32..dbe94b4a 100644 --- a/tests/rt-init.c +++ b/tests/rt-init.c @@ -39,6 +39,6 @@ ENDExit BEGINTest CODESTARTTest -finalize_it: +/*finalize_it:*/ /* room for custom error reporter, leave blank if not needed */ ENDTest |