Martin Gräßlin 3aee94d798 Merge branch 'KDE/4.9' ... Conflicts: ksysguard/gui/ksysguard.desktop kwin/effects/translucency/translucency.cpp		2012-09-07 07:59:10 +02:00
..
documentation-global.xml	Allow Scripts to add menus to the UserActionsMenu	2012-09-07 07:32:00 +02:00
kwinscript.desktop	SVN_SILENT made messages (.desktop file)	2012-08-11 12:40:05 +02:00
meta.cpp
meta.h
scriptedeffect.cpp	fix private slot name in connect	2012-06-07 18:22:09 +02:00
scriptedeffect.h	Screen Edge bindings for Scripts and Scripted Effects	2012-05-15 17:54:31 +02:00
scripting.cpp	Allow Scripts to add menus to the UserActionsMenu	2012-09-07 07:32:00 +02:00
scripting.h	Allow Scripts to add menus to the UserActionsMenu	2012-09-07 07:32:00 +02:00
scriptingutils.cpp
scriptingutils.h	Allow Scripts to add menus to the UserActionsMenu	2012-09-07 07:32:00 +02:00
timer.cpp
workspace_wrapper.cpp	Return displayHeight for property displayHeight and not displayWidth	2012-09-04 06:26:39 +02:00
workspace_wrapper.h	missing include	2012-07-19 07:11:45 +02:00