3858044d25
Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
applets | ||
containments | ||
dataengines | ||
kpart | ||
runner | ||
wallpapers | ||
CMakeLists.txt | ||
TODO |
3858044d25
Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
applets | ||
containments | ||
dataengines | ||
kpart | ||
runner | ||
wallpapers | ||
CMakeLists.txt | ||
TODO |