l10n daemon script f1bbe935d3 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 05:12:10 +02:00
..
data
CMakeLists.txt
cube.cpp	Port away from QRegion::rects	2019-07-10 01:00:51 +03:00
cube.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
cube.kcfg
cube_config.cpp
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
cube_config.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
cube_config.ui
cube_inside.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc