Merge branch 'np/delta' into next

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 72201be57c633259e65b435f8623a80e4cdc3e88..1056b7c817f8578348120f64ad7047754bf688df 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.GIT
+DEF_VER=v1.2.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default