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
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
wobblywindows_config.cpp
wobblywindows_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-21 05:47:44 +01:00
wobblywindows_config.h
wobblywindows_config.ui
wobblywindowsconfig.kcfgc