kwin/tabbox
l10n daemon script 64658c9d37 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-01-16 09:09:19 +01:00
..
clientmodel.cpp [TabBox] Don't show "Show desktop" window when cycling through application windows 2018-01-08 10:31:16 +01:00
clientmodel.h
CMakeLists.txt
desktopchain.cpp
desktopchain.h
desktopmodel.cpp
desktopmodel.h
kwindesktopswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kwinwindowswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01: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 Merge branch 'Plasma/5.11' 2017-11-16 20:34:52 +01:00
tabbox.h Remove stray semicolon 2017-09-14 15:03:41 +02:00
tabbox_logging.cpp
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp [tabbox] Guard Xcb::sync with whether we have an X11 connection 2017-09-30 16:29:42 +02:00
tabboxhandler.h [tabbox] Expose noModifierGrab to QtQuick 2017-04-12 19:46:48 +02:00
x11_filter.cpp [tabbox] Drop the passing to Effects in X11 Filter 2017-09-30 12:58:45 +02:00
x11_filter.h [tabbox] Drop the passing to Effects in X11 Filter 2017-09-30 12:58:45 +02:00