l10n daemon script 3024a7358b 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-04-08 05:54:38 +02:00
..
common	[kcmkwin] Properly load effects	2019-03-18 13:11:24 +02:00
kwincompositing	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-30 06:07:26 +01:00
kwindesktop	[kcmkwin] Properly load effects	2019-03-18 13:11:24 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
kwinrules	Remove deprecated method	2019-03-01 08:15:31 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-08 05:54:38 +02:00
kwinscripts	Overhaul doxygen comments	2019-02-12 19:29:33 +02:00
kwintabbox	Overhaul doxygen comments	2019-02-12 19:29:33 +02:00
CMakeLists.txt	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00