From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Wed, 14 Feb 2007 21:32:48 +0000 (+0100)
Subject: Merge branch 'ff/avl-tree'
X-Git-Tag: collectd-4.0.0~187
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=cb7fed8bf0af2646dfcb32844933398c28e39be5;p=collectd.git

Merge branch 'ff/avl-tree'
---

cb7fed8bf0af2646dfcb32844933398c28e39be5
diff --cc src/Makefile.am
index 58cd53ce,e0838a1f..f4c5464a
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -12,10 -11,11 +12,11 @@@ bin_PROGRAMS = collectd-nagio
  
  collectd_SOURCES = collectd.c collectd.h \
  		   utils_debug.c utils_debug.h \
+ 		   utils_avltree.c utils_avltree.h \
  		   utils_mount.c utils_mount.h \
 +		   utils_llist.c utils_llist.h \
  		   utils_ignorelist.c utils_ignorelist.h \
  		   common.c common.h \
 -		   network.c network.h \
  		   plugin.c plugin.h \
  		   configfile.c configfile.h
  collectd_CPPFLAGS = $(LTDLINCL)