projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ff/olsrd'
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
1a4cea6
..
1979e4c
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1028,7
+1028,7
@@
dist_man_MANS = collectd.1 \
collectd.conf.5 \
collectd-email.5 \
collectd-exec.5 \
- collectd-java.5
+ collectd-java.5
\
collectdmon.1 \
collectd-nagios.1 \
collectd-perl.5 \