Release of 2.18.26

jef-n · jef-n · commit 83df334a9f90 · 2018-11-23T13:08:28.000+01: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 "25")
+SET(CPACK_PACKAGE_VERSION_PATCH "26")
 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,40 @@
+rldhont <rldhont@gmail.com>	2018-11-16
+
+    [Bugfix][Symbology] Fill to SLD does not export Stroke color
+
+    The commit 2f268d4747c355a48fcadb2c55d58a06d848cffa fixing the way SLD is exporting size, from mm to pixels. But in the case of exporting line to SLD the stroke color has not been preserved.
+
+Merge: cbd7adecf2 0e066db97b
+rldhont <rldhont@gmail.com>	2018-11-02
+
+    Merge pull request #8387 from rldhont/bjornhartell-oci-fix-218
+
+    [oracle] Prefetch memory variable changed to 32-bit and default raised to 8MB
+
+Björn Harrtell <bjorn@wololo.org>	2018-10-31
+
+    [oracle] Remove meaningless conditional and improve user input handling
+
+    (cherry-pick from commit 4ab377b)
+
+    Author :     Björn Harrtell <bjorn@wololo.org>
+    Date :       Wed Oct 31 14:45:37 2018 +0100
+
+Björn Harrtell <bjorn@wololo.org>	2018-10-29
+
+    [oracle] Prefetch memory variable changed to 32-bit and default raised to 8MB
+
+    Speeds up oracle table access by orders of magnitude
+
+    (cherry-pick from commit c3e7632)
+
+    Author :     Björn Harrtell <bjorn@wololo.org>
+    Date :       Mon Oct 29 21:27:46 2018 +0100
+
+Juergen E. Fischer <jef@norbit.de>	2018-10-26
+
+    Release of 2.18.25
+
 Merge: 75a170dfb0 81f4bdbe88
 rldhont <rldhont@gmail.com>	2018-10-26
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.18.25) UNRELEASED; urgency=medium
+qgis (2.18.26) UNRELEASED; urgency=medium
+
+  * Release of 2.18.26
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Nov 2018 13:08:28 +0100
+
+qgis (2.18.25) unstable; urgency=medium
 
   * Release of 2.18.25
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 26 Oct 2018 13:59:08 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Nov 2018 13:08:28 +0100
 
 qgis (2.18.24) unstable; urgency=medium
 
