l10n daemon script 818ed8f4ad 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"		2016-12-13 05:42:59 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwinscripts	pedantic fixes	2016-07-16 13:14:44 -04:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
CMakeLists.txt