l10n daemon script b6f22a98a7 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"		2018-06-18 07:51:12 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
diminactive.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
diminactive.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
diminactive.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
diminactive_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
diminactive_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:51:12 +02:00
diminactive_config.h
diminactive_config.ui	Merge branch 'master' into frameworks-scratch	2013-09-24 11:28:38 +02:00
diminactiveconfig.kcfgc