l10n daemon script 1f645b4bc5 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-20 08:43:32 +01:00
..
CMakeLists.txt
wobblywindows.cpp	[effects/wobblywindows] Fix visual artifacts caused by maximize effect	2018-10-09 18:30:13 +03:00
wobblywindows.h	[effects/wobblywindows] Fix visual artifacts caused by maximize effect	2018-10-09 18:30:13 +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-20 08:43:32 +01:00
wobblywindows_config.h
wobblywindows_config.ui
wobblywindowsconfig.kcfgc