l10n daemon script 430ca2a33e 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"		2020-06-18 08:32:20 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
animationsmodel.cpp	Update my email address	2020-01-14 18:17:18 +02:00
animationsmodel.h	Update my email address	2020-01-14 18:17:18 +02:00
CMakeLists.txt	[KCM/Desktop] Use KConfig XT to store virtualdesktops related settings	2019-12-11 11:00:38 +01:00
desktopsmodel.cpp	[KCM/Desktop] Port from KQuickAddons::ConfigModule to ManagedConfigModule	2019-12-23 13:22:36 +01:00
desktopsmodel.h	[KCM/Desktop] Port from KQuickAddons::ConfigModule to ManagedConfigModule	2019-12-23 13:22:36 +01:00
kcm_kwin_virtualdesktops.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
Messages.sh
virtualdesktops.cpp	Update my email address	2020-01-14 18:17:18 +02:00
virtualdesktops.h	Update my email address	2020-01-14 18:17:18 +02:00
virtualdesktopssettings.kcfg	[KCM/Desktop] Port from KQuickAddons::ConfigModule to ManagedConfigModule	2019-12-23 13:22:36 +01:00
virtualdesktopssettings.kcfgc	[KCM/Desktop] Use KConfig XT to store virtualdesktops related settings	2019-12-11 11:00:38 +01:00