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