l10n daemon script 125d3e90e1 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"		2019-08-31 05:30:20 +02:00
..
common
kwincompositing
kwindecoration
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-31 05:30:20 +02:00
kwineffects
kwinoptions
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-31 05:30:20 +02:00
kwinscripts
kwintabbox
CMakeLists.txt