From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 2 Oct 2018 20:46:53 +0000 (+0200)
Subject: Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into ThomasBarr... 
X-Git-Tag: v3.3.0~84
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f45b3fa3f243de8894c03d8c9377157d01092c8c?ds=sidebyside;hp=-c

Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into ThomasBarris-updatePHP
---

f45b3fa3f243de8894c03d8c9377157d01092c8c
diff --combined CMakeLists.txt
index a7c7b395,af6b9a92..a7c7b395
mode 100644,100755..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -19,7 -19,7 +19,7 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  project(nominatim)
  
  set(NOMINATIM_VERSION_MAJOR 3)
 -set(NOMINATIM_VERSION_MINOR 1)
 +set(NOMINATIM_VERSION_MINOR 2)
  set(NOMINATIM_VERSION_PATCH 0)
  
  set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")