l10n daemon script 2bb025cbdb 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-11-02 05:41:14 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
animationsmodel.cpp	Update my last name	2019-09-29 17:03:25 +03:00
animationsmodel.h	Update my last name	2019-09-29 17:03:25 +03:00
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03: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-11-02 05:41:14 +01:00
Messages.sh	[kcmkwin/desktop] KCM using new virtual desktops DBus interface	2018-12-18 16:42:19 +09:00
virtualdesktops.cpp	Update my last name	2019-09-29 17:03:25 +03:00
virtualdesktops.h	Update my last name	2019-09-29 17:03:25 +03:00