![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/interface.c | patch | | diff1 | | diff2 | | blob | history |
| version-gen.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/interface.c
Simple merge
diff --cc version-gen.sh
index 5bc20a112927c3969901bc2157bdad18d629d210,1d5416ba800f62321138d7c5dbeb66137ec00186..5eb46de6428a7f5d88319256db4ae23dc4bf6ae6
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
- #!/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-//'`"