l10n daemon script 7b44cb6dbd 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-11-01 08:26:30 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-01 08:26:30 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-01 08:26:30 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-22 07:44:41 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-29 08:55:05 +02:00
kwinrules	[kcmkwin/ruleswidget] Disable "Detect" button when countdown is running	2018-10-12 13:51:25 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 08:44:29 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 08:44:29 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-26 08:08:30 +02:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00