diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
| commit | fc0712f40ae63aa54080683c7ee5ae52055c009d (patch) | |
| tree | b236e751acbe262a1f334221d523a2f121a3edff /runtime/Makefile.am | |
| parent | e89ae2e7b18ba935d7eea4c44f3ec15ff6dcfb31 (diff) | |
| parent | eb1615068c6a704287eda732d287280df4cc4c44 (diff) | |
| download | rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.gz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.xz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
Diffstat (limited to 'runtime/Makefile.am')
| -rw-r--r-- | runtime/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index f673eaf7..eaae9705 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -7,7 +7,7 @@ pkglib_LTLIBRARIES = librsyslog_la_SOURCES = \ rsyslog.c \ rsyslog.h \ - unicode_helper.h \ + unicode-helper.h \ atomic.h \ batch.h \ syslogd-types.h \ |