l10n daemon script 90306f5c08 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"		2019-01-06 05:42:41 +01:00
..
kwincompositing	[kcmkwin/compositing] Use ellipsis in Desktop Effects kcm	2019-01-03 19:52:51 +01:00
kwindecoration	[kcmkwin/kwindecoration] Set current decoration index on start	2019-01-03 15:26:46 +01:00
kwindesktop	[kcmkwin/desktop] Disable the OSD duration spinbox if the corresponding checkbox is unchecked	2018-12-23 15:15:20 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinrules	Port window specific rules dialog to DBus	2018-12-31 07:58:12 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00