diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
| commit | 4a5a3196fbe4e5a4e9f8dea49f916462adbf3098 (patch) | |
| tree | df7750c93603d4a979188f3385c9fe4997072c7f /runtime/Makefile.am | |
| parent | 9cf1756dc6c06682b32ed7a789ceb4254b5792df (diff) | |
| parent | cbe2e3d44496ec7c6418e7e74ce917f2086a2947 (diff) | |
| download | rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.gz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.xz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.zip | |
Merge branch 'v4-devel' into master
Conflicts:
runtime/Makefile.am
runtime/atomic.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
runtime/wtp.c
runtime/wtp.h
Diffstat (limited to 'runtime/Makefile.am')
| -rw-r--r-- | runtime/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 2e85d846..9047c83d 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -9,9 +9,7 @@ librsyslog_la_SOURCES = \ rsyslog.h \ unicode-helper.h \ atomic.h \ - atomic-posix-sem.c \ batch.h \ - atomic-posix-sem.c \ syslogd-types.h \ module-template.h \ obj-types.h \ |