Release of 2.18.20

jef-n · jef-n · commit e8e15d5b1e3e · 2018-05-18T14:01:08.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 "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "19")
+SET(CPACK_PACKAGE_VERSION_PATCH "20")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,105 @@
+Borys Jurgiel <info@borysjurgiel.pl>	2018-05-15
+
+    [tr] Polish translation update
+
+Borys Jurgiel <info@borysjurgiel.pl>	2018-05-12
+
+    [tr] Polish translation update
+
+Jason Hilton <jasface901@gmail.com>	2017-09-05
+
+    updated NaturalNeighbour gui to use new saga parameters
+
+Merge: 5b201687f2 6150b7f4e4
+Alexander Bruy <alexander.bruy@gmail.com>	2018-05-10
+
+    Merge pull request #6960 from luipir/gdalcalc_avoid_escape_formula
+
+    [processing][gdal] Do not escape formula because it's not a path!
+
+Luigi Pirelli <luipir@gmail.com>	2018-05-09
+
+    avoid escape formula because it's not a path!
+
+Juergen E. Fischer <jef@norbit.de>	2018-05-09
+
+    NSIS: Include DisplayVersion in UninstallKey (backport 100d9403)
+
+Merge: d8e39fa994 7e73f314cc
+Matthias Kuhn <matthias@opengis.ch>	2018-05-09
+
+    Merge pull request #6957 from radosuav/processing_gdal_warp
+
+    [processing] Add missing resampling methods to GDAL warp.
+
+radosuav <radoslaw.guzinski@esa.int>	2018-01-16
+
+    [processing] Add missing resampling methods to GDAL warp.
+
+Juergen E. Fischer <jef@norbit.de>	2018-05-05
+
+    remove algorithm refresh after processing configuration changes (was a NOOP before c83261395 and now causes an endless recursion; fixes #18807)
+
+Juergen E. Fischer <jef@norbit.de>	2018-05-04
+
+    revive python tests on bionic
+
+Merge: 0c033781b4 ac4d776af0
+rldhont <rldhont@gmail.com>	2018-05-02
+
+    Merge pull request #6795 from rldhont/processing-default-string-parameter-none-218
+
+    [Processing] None is the default value for parameters also for string
+
+Merge: 85fd681e43 9be84d4c88
+Matthias Kuhn <matthias@opengis.ch>	2018-05-02
+
+    Merge pull request #6916 from Gustry/saveStyleToDatabase
+
+    [2.18] fix SIP bindings saveStyleToDatabase
+
+Etienne Trimaille <gustrimaille@yahoo.fr>	2018-05-02
+
+    fix SIP bindings saveStyleToDatabase
+
+Merge: 9ce55ca08e e5aaf6a550
+Borys Jurgiel <info@borysjurgiel.pl>	2018-04-27
+
+    Merge pull request #6871 from borysiasty/dbmanager_unicode_fix
+
+    [DBManager] Fix encoding error if a field/table/database/file name co…
+
+Borys Jurgiel <info@borysjurgiel.pl>	2018-04-27
+
+    [DB Manager] Avoid unnecessary conversion (follows up b822fe750f40)
+
+Borys Jurgiel <info@borysjurgiel.pl>	2018-04-20
+
+    [DBManager] Fix encoding error if a field/table/database/file name contains unicode characters
+
+Juergen E. Fischer <jef@norbit.de>	2018-04-24
+
+    [postgres][db2] still save username when instructed too also with authcfg (backport 4ad3531103)
+
+Merge: c86045ee72 92aebefbd3
+Matthias Kuhn <matthias@opengis.ch>	2018-04-24
+
+    Merge pull request #6849 from m-kuhn/fix_georeferencer_crash_18227
+
+    Fix geroreferencer crash when deleting a point through context menu
+
+Alexis Polti <alexis.polti@telecom-paristech.fr>	2018-03-18
+
+    Fix geroreferencer crash when deleting a point through context menu
+
+Juergen E. Fischer <jef@norbit.de>	2018-04-20
+
+    german translation update
+
+Juergen E. Fischer <jef@norbit.de>	2018-04-20
+
+    Release of 2.18.19
+
 Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-04-20
 
     Add safety check
@@ -79,6 +181,10 @@ Borys Jurgiel <info@borysjurgiel.pl>	2018-04-16
 
     [tr] Polish translation update
 
+rldhont <rldhont@gmail.com>	2018-04-13
+
+    [Processing] None is the default value for parameters also for string
+
 Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-04-13
 
     Server: return empty image in GetLegendGraphis if no layer is there (e.g. contextual legend)
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.18.19) UNRELEASED; urgency=medium
+qgis (2.18.20) UNRELEASED; urgency=medium
+
+  * Release of 2.18.20
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 18 May 2018 14:01:08 +0200
+
+qgis (2.18.19) unstable; urgency=medium
 
   * Release of 2.18.19
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 20 Apr 2018 14:00:07 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 18 May 2018 14:01:08 +0200
 
 qgis (2.18.18) unstable; urgency=medium
 
