l10n daemon script d143c2d236 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"		2019-08-07 08:44:46 +02:00
..
data	[effects/cube] Update cubecap texture	2018-09-28 21:20:11 +03:00
CMakeLists.txt	[effects] Move the Desktop Cube Animation effect to its own directory	2018-09-28 20:07:32 +03:00
cube.cpp	[effects] Port to new connect syntax	2019-01-26 01:22:06 +02:00
cube.h
cube.kcfg
cube_config.cpp	[effects] Port to new connect syntax	2019-01-26 01:22:06 +02:00
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 08:44:46 +02:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc