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 63a0b4133e 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"
10 years ago
..
data
CMakeLists.txt Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead. 10 years ago
cube.cpp cube: Always set the shader in WindowPaintData 10 years ago
cube.h
cube.kcfg
cube_config.cpp
cube_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 10 years ago
cube_config.h
cube_config.ui
cube_inside.h
cube_proxy.cpp
cube_proxy.h
cubeconfig.kcfgc
cubeslide.cpp
cubeslide.h
cubeslide.kcfg
cubeslide_config.cpp
cubeslide_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 10 years ago
cubeslide_config.h
cubeslide_config.ui
cubeslideconfig.kcfgc