Merge branch 'master' of ssh://github.com/fluxer/katana

This commit is contained in:
Ivailo Monev 2022-04-29 14:50:41 +03:00
commit 6a26bf9442
4 changed files with 7 additions and 4 deletions

View file

@ -695,6 +695,7 @@ share/apps/kfontinst/icons/ariya/scalable/actions/fontstatus.svgz
share/apps/kfontinst/kfontviewpart.rc
share/apps/kfontview/kfontviewui.rc
share/apps/kglobalaccel/kglobalaccel.notifyrc
share/apps/kgreeter/rectangle.png
share/apps/khotkeys/defaults.khotkeys
share/apps/khotkeys/printscreen.khotkeys
share/apps/kinfocenter/kinfocenterui.rc
@ -869,7 +870,6 @@ share/apps/plasma/packages/org.kde.systemtray/contents/ui/StatusNotifierItem.qml
share/apps/plasma/packages/org.kde.systemtray/contents/ui/TrayIcon.qml
share/apps/plasma/packages/org.kde.systemtray/contents/ui/main.qml
share/apps/plasma/plasmoids/battery/contents/code/logic.js
share/apps/plasma/plasmoids/battery/contents/config/main.xml
share/apps/plasma/plasmoids/battery/contents/ui/BatteryIcon.qml
share/apps/plasma/plasmoids/battery/contents/ui/BatteryItem.qml
share/apps/plasma/plasmoids/battery/contents/ui/CompactRepresentation.qml

View file

@ -230,6 +230,8 @@ include/KDE/KIconLoader
include/KDE/KIconTheme
include/KDE/KIdentityProxyModel
include/KDE/KIdleTime
include/KDE/KExiv2
include/KDE/KPasswdStore
include/KDE/KImageFilePreview
include/KDE/KImageIO
include/KDE/KInputDialog
@ -299,7 +301,6 @@ include/KDE/KParts/Factory
include/KDE/KParts/FileInfoExtension
include/KDE/KParts/GUIActivateEvent
include/KDE/KParts/ListingExtension
include/KDE/KParts/LiveConnectExtension
include/KDE/KParts/MainWindow
include/KDE/KParts/OpenUrlEvent
include/KDE/KParts/Part
@ -722,6 +723,7 @@ include/kdesktopfile.h
include/kdesktopfileactions.h
include/kdeui_export.h
include/kdeversion.h
include/kdevicedatabase.h
include/kdialog.h
include/kdialogbuttonbox.h
include/kdialogjobuidelegate.h

View file

@ -863,7 +863,6 @@ share/apps/plasma/packages/org.kde.systemtray/contents/ui/StatusNotifierItem.qml
share/apps/plasma/packages/org.kde.systemtray/contents/ui/TrayIcon.qml
share/apps/plasma/packages/org.kde.systemtray/contents/ui/main.qml
share/apps/plasma/plasmoids/battery/contents/code/logic.js
share/apps/plasma/plasmoids/battery/contents/config/main.xml
share/apps/plasma/plasmoids/battery/contents/ui/BatteryIcon.qml
share/apps/plasma/plasmoids/battery/contents/ui/BatteryItem.qml
share/apps/plasma/plasmoids/battery/contents/ui/CompactRepresentation.qml

View file

@ -231,6 +231,8 @@ include/KDE/KIconLoader
include/KDE/KIconTheme
include/KDE/KIdentityProxyModel
include/KDE/KIdleTime
include/KDE/KExiv2
include/KDE/KPasswdStore
include/KDE/KImageFilePreview
include/KDE/KImageIO
include/KDE/KInputDialog
@ -300,7 +302,6 @@ include/KDE/KParts/Factory
include/KDE/KParts/FileInfoExtension
include/KDE/KParts/GUIActivateEvent
include/KDE/KParts/ListingExtension
include/KDE/KParts/LiveConnectExtension
include/KDE/KParts/MainWindow
include/KDE/KParts/OpenUrlEvent
include/KDE/KParts/Part
@ -723,6 +724,7 @@ include/kdesktopfile.h
include/kdesktopfileactions.h
include/kdeui_export.h
include/kdeversion.h
include/kdevicedatabase.h
include/kdialog.h
include/kdialogbuttonbox.h
include/kdialogjobuidelegate.h