l10n daemon script f1bbe935d3 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-08-07 05:12:10 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +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	[kcmkwin/desktop] KCM using new virtual desktops DBus interface	2018-12-18 16:42:19 +09:00
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-08-07 05:12:10 +02:00
Messages.sh	[kcmkwin/desktop] KCM using new virtual desktops DBus interface	2018-12-18 16:42:19 +09:00
virtualdesktops.cpp	[kcmkwin/kwindesktop] Improve the look of the Virtual Desktops KCM UI	2019-08-05 16:58:21 +02:00
virtualdesktops.h	[kcmkwin/desktop] Add animation option back	2019-01-08 15:49:36 +02:00