Merge branch 'maint-1.6.0' into maint

diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
index 4e709ebe776f722ff5509c8bf1b9cfaf9d7923b4..b3f937eace99ce1e25afbdbea678e9f6926dbc75 100755 (executable)
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=0.11.GITGUI
+DEF_VER=0.12.GITGUI
 
 LF='
 '