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
..
data	[effects] Change sphere to use shader traits variant	2016-01-25 14:11:54 +01:00
CMakeLists.txt	[effects] Combine all shaders in resources	2016-02-01 08:42:30 +01:00
cube.cpp	[effects] Don't register touch edges which don't exist	2017-08-24 13:38:55 +02:00
cube.h	Fix build with a KWindowSystem framework that doesn't pull QWidget	2017-11-17 17:30:58 +01: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-07-23 07:12: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 07:12:23 +02:00
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc