Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 156dc137339c4184727d1916e49a5bdf8c674d68..6c7465c75865577a87260c7936cb286ab84c6db6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.0.GIT
+DEF_VER=v1.6.0.2.GIT
 
 LF='
 '