Merge branch 'jk/make-findstring-makeflags-fix'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5e23aba39c9fad611b292d2e7f7c2bf4ce717e8f..97f58d1dbb5fa4b0b921061371befe9822116941 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.1
+DEF_VER=v2.6.0
 
 LF='
 '