From: Nate Graham <nate@kde.org>
Date: Sun, 17 Mar 2019 22:12:38 +0000 (-0600)
Subject: Merge branch 'Applications/19.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/363fd1afa9dc68ffdee4d55a8c8bde56a13f0969?hp=-c

Merge branch 'Applications/19.04'
---

363fd1afa9dc68ffdee4d55a8c8bde56a13f0969
diff --combined CMakeLists.txt
index 5e5a11a17,72ab75d36..3408153ec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,8 -2,8 +2,8 @@@ cmake_minimum_required(VERSION 3.0
  
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "19")
 -set (KDE_APPLICATIONS_VERSION_MINOR "03")
 -set (KDE_APPLICATIONS_VERSION_MICRO "80")
 +set (KDE_APPLICATIONS_VERSION_MINOR "07")
 +set (KDE_APPLICATIONS_VERSION_MICRO "70")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
@@@ -142,5 -142,7 +142,7 @@@ install(FILES ${CMAKE_CURRENT_BINARY_DI
  
  install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
  
+ install( FILES dolphin.khotkeys DESTINATION ${KDE_INSTALL_DATADIR}/khotkeys )
+ 
  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)