l10n daemon script aa0f2c88f0 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"		2016-01-10 11:46:53 +00:00
..
autotests	[tabbox] Add dedicated logging category for TabBox	2015-07-31 13:13:41 +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	2016-01-10 11:46:53 +00:00
kwinwindowswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-07 21:21:42 +00:00
switcheritem.cpp	update SwitcherItem::screenGeometry when showing	2015-08-19 12:31:31 +02:00
switcheritem.h
tabbox.cpp	support changing tabbox mode	2015-09-29 23:02:41 +02:00
tabbox.h	support changing tabbox mode	2015-09-29 23:02:41 +02:00
tabbox_logging.cpp	[tabbox] Add dedicated logging category for TabBox	2015-07-31 13:13:41 +02:00
tabbox_logging.h	[tabbox] Add dedicated logging category for TabBox	2015-07-31 13:13:41 +02:00
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp	optimize string operations	2015-11-05 14:14:06 +00:00
tabboxhandler.h