diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
commit | ff0f04561286ba3635f128083b46501831368701 (patch) | |
tree | 70f79d74141338cf828af122827f9367cdbb6d44 /tests/Makefile.am | |
parent | acebcd793e4898b524a9ea13b96c491aee4d67e2 (diff) | |
parent | 605701700a8914ebaff283193756a6e57d7d575b (diff) | |
download | rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.gz rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.xz rsyslog-ff0f04561286ba3635f128083b46501831368701.zip |
Merge branch 'v4-beta' into master
Conflicts:
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 33acb855..63dba939 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -109,6 +109,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/8bit.parse1 \ testsuites/empty.parse1 \ testsuites/oversizeTag-1.parse1 \ + testsuites/weird.parse1 \ testsuites/date1.parse1 \ testsuites/date2.parse1 \ testsuites/date3.parse1 \ |