You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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"
5 years ago
..
data
CMakeLists.txt
cube.cpp
cube.h
cube.kcfg
cube_config.cpp
cube_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc