l10n daemon script 0f97a13fc4 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-09-26 05:23:56 +02:00
..
common
kwincompositing	[kcmkwin/compositing] Hide animation speed slider on Plasma	2019-09-25 14:50:25 +01:00
kwindecoration
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 05:23:56 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 05:23:56 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 05:23:56 +02:00
kwinrules	Don't initialize QFlags<T> with nullptr	2019-09-19 21:42:34 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 05:23:56 +02:00
kwinscripts
kwintabbox
CMakeLists.txt