[geos-commits] [SCM] geos branch master updated. a51a06b1ca566363b023b79d296f636aa163d908

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".

The branch, master has been updated
       via  a51a06b1ca566363b023b79d296f636aa163d908 (commit)
       via  a606747995b4d38a7e63f436f8d5057a9917fe51 (commit)
      from  aae36582e743505c863c5767e5989da48f84d5a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a51a06b1ca566363b023b79d296f636aa163d908
Merge: aae3658 a606747
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 11 09:38:46 2017 -0700

    Merge branch 'ml/msvs-15.4.0' of mloskot/geos into master


commit a606747995b4d38a7e63f436f8d5057a9917fe51
Author: Mateusz Loskot <mateusz at loskot.net>
Date:   Wed Oct 11 17:22:02 2017 +0100

    Recognise NMAKE version from VS2017 15.4.0

diff --git a/nmake.opt b/nmake.opt
index 095a04d..1850f6d 100644
--- a/nmake.opt
+++ b/nmake.opt
@@ -159,6 +159,9 @@ GEOS_MSC = 1910
 !ELSEIF "$(_NMAKE_VER)" == "14.11.25508.2"
 GEOS_MSVC = 14.10
 GEOS_MSC = 1910
+!ELSEIF "$(_NMAKE_VER)" == "14.11.25547.0"
+GEOS_MSVC = 14.1
+GEOS_MSC = 1910
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0

-----------------------------------------------------------------------

Summary of changes:
 nmake.opt |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
geos