l10n daemon script 56e3b5b116 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-08-29 09:19:15 +00:00
..
clientmodel.cpp
clientmodel.h
CMakeLists.txt	Move tabbox/autotests to autotests/tabbox	2016-06-29 10:38:17 +02:00
desktopchain.cpp
desktopchain.h
desktopmodel.cpp
desktopmodel.h
kwindesktopswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-29 09:19:15 +00:00
kwinwindowswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-29 09:19:15 +00:00
switcheritem.cpp
switcheritem.h
tabbox.cpp	Make Toplevel::window() no longer virtual and introduce ::windowId()	2016-05-17 14:13:24 +02:00
tabbox.h
tabbox_logging.cpp	pedantic fixes	2016-07-16 13:14:44 -04:00
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp
tabboxhandler.h