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

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