Merge branch 'release-3_4' into backport-fix-help-button-group

qgis · Feb 27, 2019 · 06f595b · 06f595b
2 parents 4311a46 + 8ba90fc
commit 06f595b
Show file tree

Hide file tree

Showing 207 changed files with 8,594 additions and 2,934 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ CMAKE_POLICY (SET CMP0053 NEW)
 # Project and version
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "4")
-SET(CPACK_PACKAGE_VERSION_PATCH "4")
+SET(CPACK_PACKAGE_VERSION_PATCH "5")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Madeira")
 PROJECT(qgis VERSION ${COMPLETE_VERSION})