l10n daemon script bb32691980 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-07-31 05:23:00 +02:00
..
package	Merge branch 'Plasma/5.16'	2019-07-30 09:24:11 +02:00
animationsmodel.cpp	[kcmkwin] Properly load effects	2019-03-18 13:11:24 +02:00
animationsmodel.h	[kcmkwin] Rename EffectModel to EffectsModel	2019-03-18 13:10:51 +02:00
CMakeLists.txt	[kcmkwin/desktop] Add animation option back	2019-01-08 15:49:36 +02:00
desktopsmodel.cpp
desktopsmodel.h	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
kcm_kwin_virtualdesktops.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:23:00 +02:00
Messages.sh
virtualdesktops.cpp	[kcmkwin] Add requestConfigure to effects model	2019-03-18 13:09:03 +02:00
virtualdesktops.h	[kcmkwin/desktop] Add animation option back	2019-01-08 15:49:36 +02:00