l10n daemon script cfd296326b 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-10-23 05:33:32 +02:00
..
CMakeLists.txt
cubeslide.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
cubeslide.h
cubeslide.kcfg
cubeslide_config.cpp
cubeslide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 05:33:32 +02:00
cubeslide_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
cubeslide_config.ui
cubeslideconfig.kcfgc