diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
commit | 0fa5486a4ace7a9be82b37979cf4693aff237340 (patch) | |
tree | 6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /runtime/Makefile.am | |
parent | 737614054caadf8340b638b368d43f55b7bb3741 (diff) | |
parent | aba90e82484118f3568ec51c01de5ba845da589a (diff) | |
download | rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.xz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'runtime/Makefile.am')
-rw-r--r-- | runtime/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index f0fb1cdd..f673eaf7 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -7,6 +7,7 @@ pkglib_LTLIBRARIES = librsyslog_la_SOURCES = \ rsyslog.c \ rsyslog.h \ + unicode_helper.h \ atomic.h \ batch.h \ syslogd-types.h \ |