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 129636de2e 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"		9 years ago
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	9 years ago
kwindecoration	Merge branch 'Plasma/5.4'	9 years ago
kwindesktop	SVN_SILENT made messages (.desktop file)	9 years ago
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	9 years ago
kwinrules	SVN_SILENT made messages (.desktop file)	9 years ago
kwinscreenedges	Drop PreventScreenLocking electric border	9 years ago
kwinscripts	SVN_SILENT made messages (.desktop file)	9 years ago
kwintabbox	SVN_SILENT made messages (.desktop file)	9 years ago
CMakeLists.txt	…