projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0cf5df3
)
Merge branch 'collectd-5.4'
author
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000
(09:27 +0200)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000
(09:27 +0200)
Conflicts:
src/Makefile.am
src/network.c
version-gen.sh
patch
|
blob
|
history
diff --git
a/version-gen.sh
b/version-gen.sh
index
e251950
..
7b573ab
100755
(executable)
--- a/
version-gen.sh
+++ b/
version-gen.sh
@@
-1,4
+1,4
@@
-#!/
usr/bin/env ba
sh
+#!/
bin/
sh
DEFAULT_VERSION="5.4.2.git"