l10n daemon script 8dfd4c04dd 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-07-23 07:12:23 +02:00
..
CMakeLists.txt
wobblywindows.cpp	[effects/wobblywindows] Move computeVectorBounds into ifdef section	2017-07-31 17:58:57 +02:00
wobblywindows.h
wobblywindows.kcfg
wobblywindows_config.cpp
wobblywindows_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
wobblywindows_config.h
wobblywindows_config.ui
wobblywindowsconfig.kcfgc