projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
[collectd.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
30beb63
..
7dda784
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,4
+1,5
@@
SUBDIRS = libltdl src
+
INCLUDES = $(LTDLINCL)
EXTRA_DIST = collectd.spec contrib debian