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 7c747e1591 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
..
kwincompositing
kwindecoration
kwindesktop
kwinoptions
kwinrules
kwinscreenedges
kwinscripts
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 10 years ago
CMakeLists.txt