Merge git://ozlabs.org/~paulus/gitk

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 38e296b311bfe959bfe3c0382883598258aadf48..181f397bd4537988fe68e997fb95279e86838ebc 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.4.9
+DEF_VER=v2.6.0-rc1
 
 LF='
 '