l10n daemon script 48002ab7fe 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-10-10 06:54:14 +02:00
..
kwincompositing	[effects] Make scripted effects GHNS-able	2018-09-28 20:17:30 +03:00
kwindecoration
kwindesktop
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-29 06:04:44 +02:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:54:14 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 06:16:40 +02:00
kwintabbox	[kcmkwin/tabbox] Update window thumbnails	2018-10-02 19:47:58 +03:00
CMakeLists.txt