656d7a2d99
Conflicts: CMakeLists.txt (version) plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks) |
||
---|---|---|
.. | ||
plasma.protocol |
656d7a2d99
Conflicts: CMakeLists.txt (version) plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks) |
||
---|---|---|
.. | ||
plasma.protocol |