l10n daemon script 2a6048c885 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"		2017-05-25 05:40:47 +02:00
..
clientmodel.cpp
clientmodel.h
CMakeLists.txt
desktopchain.cpp
desktopchain.h
desktopmodel.cpp
desktopmodel.h
kwindesktopswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-25 05:40:47 +02:00
kwinwindowswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-25 05:40:47 +02:00
switcheritem.cpp	[tabbox] Expose noModifierGrab to QtQuick	2017-04-12 19:46:48 +02:00
switcheritem.h	[tabbox] Expose noModifierGrab to QtQuick	2017-04-12 19:46:48 +02:00
tabbox.cpp	Make WindowSwitching (Alt+Tab) the default left touch screen edge	2017-05-02 20:33:21 +02:00
tabbox.h	[tabbox] Expose noModifierGrab to QtQuick	2017-04-12 19:46:48 +02:00
tabbox_logging.cpp
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp	[tabbox] Expose noModifierGrab to QtQuick	2017-04-12 19:46:48 +02:00
tabboxhandler.h	[tabbox] Expose noModifierGrab to QtQuick	2017-04-12 19:46:48 +02:00