l10n daemon script c04c285b6a 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-03 04:50:14 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-29 07:51:37 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-16 05:07:40 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02: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-03 04:50:14 +01:00
kwinscripts	kwinscripts: change i18n string "Get New Scripts..."	2017-10-12 16:46:43 +03:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-06 04:38:04 +01:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00