l10n daemon script 50b948134c 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"		2017-12-28 04:45:41 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-28 04:45:41 +01:00
kwinrules	kcmkwinrules: Fix window title	2017-10-15 18:36:38 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-22 05:11:16 +01:00
kwinscripts	Remove no longer needed moc include	2017-12-19 02:19:37 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-06 04:38:04 +01:00
CMakeLists.txt