l10n daemon script f18deb69f1 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"		2020-06-09 09:19:42 +02:00
..
data
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
cube.cpp
cube.h
cube.kcfg
cube_config.cpp
cube_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:19:42 +02:00
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc