baf21f6b34
Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| dbus.h | ||
| interface_util.h | ||
| ktimerdialog.cpp | ||
| ktimerdialog.h | ||
| kwincompositing.desktop | ||
| kwineffect.knsrc | ||
| main.cpp | ||
| main.h | ||
| main.ui | ||
| Messages.sh | ||