l10n daemon script 99237c9b3f SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2015-06-01 10:08:03 +00:00
..
CMakeLists.txt	-Wmissing-include-dirs	2015-03-22 22:36:26 +01:00
dbuscall.cpp
dbuscall.h
documentation-effect-global.xml
documentation-global.xml
genericscriptedconfig.cpp	Drop our custom KLocalizedTranslator	2014-06-18 15:02:58 +02:00
genericscriptedconfig.h	Drop our custom KLocalizedTranslator	2014-06-18 15:02:58 +02:00
genericscriptedconfig.json	[kwin] Fix genericscripted config	2014-03-19 08:00:28 +01:00
kwinscript.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
Messages.sh
meta.cpp
meta.h
screenedgeitem.cpp	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00
screenedgeitem.h
scriptedeffect.cpp	ScriptedEffect: gauss curve anim and ended signal	2015-04-07 23:59:18 +02:00
scriptedeffect.h	ScriptedEffect: gauss curve anim and ended signal	2015-04-07 23:59:18 +02:00
scripting.cpp	[scripting] Register KWin::AbstractClient in declarative scripts	2015-05-12 11:32:05 +02:00
scripting.h	[scripting] actionsForUserActionMenu operates on AbstractClient	2015-05-08 12:43:45 +02:00
scripting_model.cpp	Change Workspace::clientRemoved to carry an AbstractClient	2015-05-08 12:43:47 +02:00
scripting_model.h	Change Workspace::clientRemoved to carry an AbstractClient	2015-05-08 12:43:47 +02:00
scriptingutils.cpp
scriptingutils.h	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00
timer.cpp
workspace_wrapper.cpp	Change Workspace::clientRemoved to carry an AbstractClient	2015-05-08 12:43:47 +02:00
workspace_wrapper.h	Change Workspace::clientRemoved to carry an AbstractClient	2015-05-08 12:43:47 +02:00