Oliver Henshaw 47acf4ee9a Merge remote-tracking branch 'origin/KDE/4.10' into master ... Conflicts: kwin/scripting/scripting.cpp powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop		2013-05-28 17:36:53 +01:00
..
CMakeLists.txt
documentation-effect-global.xml
documentation-global.xml
genericscriptedconfig.cpp
genericscriptedconfig.h
kwinscript.desktop
Messages.sh
meta.cpp
meta.h
scriptedeffect.cpp	fix effect script parsing	2013-04-16 22:07:07 +02:00
scriptedeffect.h
scripting.cpp	Merge remote-tracking branch 'origin/KDE/4.10' into master	2013-05-28 17:36:53 +01:00
scripting.h
scripting_model.cpp
scripting_model.h
scriptingutils.cpp
scriptingutils.h
timer.cpp
workspace_wrapper.cpp
workspace_wrapper.h