Merge remote-tracking branch 'origin/Applications/15.04'

Conflicts: CMakeLists.txt
11 years ago · 74fd144ce3
parent 9f8d393394 976d5c621d
commit 74fd144ce3
1 changed files with 1 additions and 1 deletions
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@ -8,7 +8,7 @@ Categories=Qt;KDE;System;TerminalEmulator;
 Actions=NewWindow;
 X-DocPath=konsole/index.html
 X-DBUS-StartupType=Unique
-X-KDE-StartupNotify=true
+StartupNotify=true
 X-KDE-AuthorizeAction=shell_access

 Name=Konsole