Conflicts: CMakeLists.txt [versioning] kio/kio/accessmanager.cpp [headers] tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT] tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT] |
||
---|---|---|
.. | ||
plasma.protocol |
Conflicts: CMakeLists.txt [versioning] kio/kio/accessmanager.cpp [headers] tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT] tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT] |
||
---|---|---|
.. | ||
plasma.protocol |