l10n daemon script 4c6e7b9200 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"		2018-02-25 07:18:47 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 07:18:47 +01:00
kwindecoration	Make it possible to compile 5.12 branch with a kdecoration from master	2018-02-07 19:43:53 +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	Disable window rule configuration for Wayland	2018-02-21 18:06:47 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-04 04:53:47 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 07:18:47 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 07:18:47 +01:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00