Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/git.rc b/git.rc
index bce6db96a333c2d47b07580c5a9207cf10935378..33aafb786cf7f73eb7d4a769e585cb958999e68a 100644 (file)
--- a/git.rc
+++ b/git.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION     MAJOR,MINOR,PATCH,0
-PRODUCTVERSION  MAJOR,MINOR,PATCH,0
+FILEVERSION     MAJOR,MINOR,0,0
+PRODUCTVERSION  MAJOR,MINOR,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN