l10n daemon script fe27d39b5c 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-10-17 05:41:38 +02:00
..
clientmodel.cpp	Port away from deprecated qVariantFromValue	2019-09-18 16:20:06 +03:00
clientmodel.h
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
desktopchain.cpp
desktopchain.h
desktopmodel.cpp	Port away from deprecated qVariantFromValue	2019-09-18 16:20:06 +03:00
desktopmodel.h
kwindesktopswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00
kwinwindowswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00
switcheritem.cpp
switcheritem.h
tabbox.cpp	Merge branch 'Plasma/5.17'	2019-10-15 12:41:39 +01:00
tabbox.h	Rename Client to X11Client	2019-09-25 21:11:37 +03:00
tabbox_logging.cpp
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp	[tabbox] Delete unused X11 includes	2019-09-07 12:45:28 +03:00
tabboxhandler.h	[tabbox] Delete unused X11 includes	2019-09-07 12:45:28 +03:00
x11_filter.cpp
x11_filter.h