[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/memory.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6d3dc246eb6ce32214825f909541cf7cbd441948
Merge: e2df20972ce0692d20479caea66b894edb5cc1b7 e4b274ed754af52196d3390b8ce101a7f94e318a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 2 16:00:23 2007 +0200

    Merge branch 'pull/master'
    
    Conflicts:
    
    	src/memory.c

commit e2df20972ce0692d20479caea66b894edb5cc1b7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 2 15:59:21 2007 +0200

    memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.