l10n daemon script 9ca27c6690 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"		2020-01-31 09:47:38 +01:00
..
common
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-28 09:42:15 +01:00
kwindecoration	[decoration] Implement the size property	2020-01-28 18:42:17 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-29 09:28:27 +01:00
kwineffects
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-31 09:47:38 +01:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-29 09:28:27 +01:00
kwinscripts
kwintabbox
CMakeLists.txt