Thomas Lübking 24cf0e75f3 Merge branch 'KDE/4.9' ... Conflicts: kwin/scene.cpp plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop		2012-09-19 20:21:18 +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	Let kwin scripts add dynamic properties to client objects.	2012-04-24 17:42:16 +02:00
meta.h	fix tabbing	2012-02-11 16:30:22 +01:00
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	Merge branch 'KDE/4.9'	2012-09-19 20:21:18 +02:00
scripting.h	Merge branch 'KDE/4.9'	2012-09-19 20:21:18 +02:00
scriptingutils.cpp	Asserts for KWin scripts	2012-05-10 10:00:54 +02:00
scriptingutils.h	Allow Scripts to add menus to the UserActionsMenu	2012-09-07 07:32:00 +02:00
timer.cpp	Simplify the Timer in scripting	2012-01-22 13:02:34 +01:00
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