baf21f6b34
Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop |
||
---|---|---|
.. | ||
contents/code | ||
CMakeLists.txt | ||
metadata.desktop |
baf21f6b34
Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop |
||
---|---|---|
.. | ||
contents/code | ||
CMakeLists.txt | ||
metadata.desktop |