Merge branch 'master' of git://anongit.kde.org/kde-workspace
author Anne-Marie Mahfouf
()
committer Anne-Marie Mahfouf
()
commit af287badaf831bc42b1c33265a44d5b843a80f7f
tree bd462e2fadff80f16c9d08e24f248fc6deacc2dc
parent 37e0836532f1d4828bd5a3ce0883f853340041fb
parent 943c8bb183ff45fcbffe3c626d361198f317f6e4
Merge branch 'master' of git://anongit.kde.org/kde-workspace
ksysguard/gui/ProcessTable.h [ deleted file ]
ksysguard/gui/SensorDisplayLib/ListView.cpp
ksysguard/gui/WorkSheet.cpp
ksysguard/gui/Workspace.cpp
ksysguard/gui/ksysguard.cpp
ksysguard/gui/ksysguard.h
kwin/libkwineffects/kwinglobals.h
kwin/scripting/scriptingutils.h
libs/ksysguard/processcore/processes.cpp
plasma/generic/dataengines/mpris2/playercontainer.h