l10n daemon script ce31ac08d4 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-09-04 06:05:23 +02:00
..
data
CMakeLists.txt
cube.cpp	[effects/cube] Port to TimeLine	2018-06-30 10:52:42 +03:00
cube.h	[effects/cube] Change type of the rotationDuration property to int	2018-07-02 12:46:38 +03:00
cube.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
cube_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-04 06:05:23 +02:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc
cubeslide.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
cubeslide.h
cubeslide.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
cubeslide_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
cubeslide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc