Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100)
1  2 
src/interface.c
version-gen.sh

diff --cc src/interface.c
Simple merge
diff --cc version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
- #!/bin/sh
+ #!/usr/bin/env bash
  
 -DEFAULT_VERSION="4.10.5.git"
 +DEFAULT_VERSION="5.0.2.git"
  
  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"