Release of 2.14.18

jef-n · jef-n · commit c3d2fb700f5a · 2017-08-18T14:31:42.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "17")
+SET(CPACK_PACKAGE_VERSION_PATCH "18")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Essen")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+Larry Shaffer <lshaffer@boundlessgeo.com>	2017-08-14
+
+    Add QSCINTILLA_INCLUDE_DIR to custom widgets CMake setup
+
+rldhont <rldhont@gmail.com>	2017-07-26
+
+    [BUGFIX][SERVER] GetFeatureInfo not evaluated for maptip context when using FILTER param
+
+    fixed #16670
+
+Juergen E. Fischer <jef@norbit.de>	2017-07-21
+
+    Release of 2.14.17
+
 Even Rouault <even.rouault@spatialys.com>	2017-07-08
 
     [OGR] Use OGR_F_SetFieldNull() with GDAL >= 2.2 to avoid GeoJSON fields to be unset (fixes #16812)
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.14.17) UNRELEASED; urgency=medium
+qgis (2.14.18) UNRELEASED; urgency=medium
+
+  * Release of 2.14.18
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 18 Aug 2017 14:31:42 +0200
+
+qgis (2.14.17) unstable; urgency=medium
 
   * Release of 2.14.17
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 21 Jul 2017 14:00:03 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 18 Aug 2017 14:31:42 +0200
 
 qgis (2.14.16) unstable; urgency=medium
 
