l10n daemon script 7d5a009aec 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-11-21 05:47:44 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
wobblywindows.cpp	[effects/wobblywindows] Delete commented code	2018-10-18 19:17:13 +03:00
wobblywindows.h	[effects/wobblywindows] Delete ':wq'	2018-10-13 11:00:27 +03:00
wobblywindows.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
wobblywindows_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
wobblywindows_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-21 05:47:44 +01:00
wobblywindows_config.h	[kwin/effects] Use generated dbus interface to reconfigure effects	2014-03-25 15:49:19 +01:00
wobblywindows_config.ui	KIntSpinBox -> QSpinBox in kwin/effects configs	2013-09-09 07:38:30 +02:00
wobblywindowsconfig.kcfgc