diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
| commit | 22328c72aef2df73741afefe0e8b53d3ad83f15d (patch) | |
| tree | 4a0b311508ebb28a0dc72e12993f704c2709d46a /runtime/Makefile.am | |
| parent | da933a7e105acf814d5e7955d39d29eab3a96613 (diff) | |
| parent | 7c0ca7553738161c681c0d0600de99e9fabee81d (diff) | |
| download | rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.xz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
runtime/datetime.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 14abe722..caf7c5ca 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -9,6 +9,7 @@ librsyslog_la_SOURCES = \ rsyslog.h \ unicode-helper.h \ atomic.h \ + batch.h \ syslogd-types.h \ module-template.h \ obj-types.h \ |