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 262da1b7c9 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
..
CMakeLists.txt Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead. 10 years ago
resize.cpp
resize.h
resize.kcfg
resize_config.cpp
resize_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 10 years ago
resize_config.h
resize_config.ui
resizeconfig.kcfgc