l10n daemon script ee60653640 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-05-08 05:51:51 +02:00
..
common	[kcmkwin] Actually save effect settings	2019-04-10 11:40:46 +03:00
kwincompositing	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00
kwindecoration	[kcmkwin/kwindecoration] Refine drag-and-drop button UI	2019-05-02 17:07:22 -06: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-05-08 05:51:51 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-18 06:12:39 +02: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	[kcmkwin/kwintabbox] Use a more appropriate icon	2019-04-25 07:23:12 -06:00
CMakeLists.txt	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00