l10n daemon script 21cfb10c4f 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-15 06:33:31 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-15 06:33:31 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
kwinscripts	[Scripts KCM] Use GHNS Button instead of creating a look-alike button	2016-12-13 08:26:15 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00