l10n daemon script 866dfb4e89 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"		2021-01-14 07:04:00 +01:00
..
data
CMakeLists.txt
cube.cpp	Provide expected presentation time to effects	2020-12-10 07:14:42 +00:00
cube.h	Provide expected presentation time to effects	2020-12-10 07:14:42 +00:00
cube.kcfg	Port from QStandardPaths::DataLocation to QStandardPaths::AppDataLocation	2020-10-31 14:38:21 +01:00
cube_config.cpp
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc