kwin/tabbox
l10n daemon script 99237c9b3f 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"
2015-06-01 10:08:03 +00:00
..
autotests Provide x11Connection as a property on the KWin::Application 2015-03-17 09:44:53 +01:00
clientmodel.cpp
clientmodel.h
CMakeLists.txt Desktop switchers moved to kdeplasma-addons 2014-10-31 09:34:48 +01:00
desktopchain.cpp
desktopchain.h
desktopmodel.cpp
desktopmodel.h
kwindesktopswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-06-01 10:08:03 +00:00
kwinwindowswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-06-01 10:08:03 +00:00
switcheritem.cpp
switcheritem.h
tabbox.cpp Remove no longer needed casts from TabBox::establish/removeTabBoxGrab 2015-05-08 12:43:46 +02:00
tabbox.h TabBox::shadeActivate operates on AbstractClient 2015-05-08 12:43:46 +02:00
tabboxconfig.cpp
tabboxconfig.h [tabbox] Try locating the WindowSwitcher QML through configured lnf package 2014-10-28 16:53:23 +01:00
tabboxhandler.cpp Drop not needed includes of QX11Info 2015-03-17 09:44:53 +01:00
tabboxhandler.h ShadeHover highlighted windows in tabbox 2015-02-10 21:41:25 +01:00