You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
11 years ago
..
CMakeLists.txt
Messages.sh
documentation-effect-global.xml
documentation-global.xml
genericscriptedconfig.cpp
genericscriptedconfig.h
kwinscript.desktop
meta.cpp
meta.h
scriptedeffect.cpp
scriptedeffect.h
scripting.cpp Merge remote-tracking branch 'origin/KDE/4.10' into master 11 years ago
scripting.h
scripting_model.cpp
scripting_model.h
scriptingutils.cpp
scriptingutils.h
timer.cpp
workspace_wrapper.cpp
workspace_wrapper.h