kwin/tabbox
l10n daemon script 64786630a5 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"
2020-01-29 05:45:29 +01: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 2020-01-29 05:45:29 +01:00
kwinwindowswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-17 05:41:38 +02:00
switcheritem.cpp
switcheritem.h
tabbox.cpp Drop some custom list typedefs 2019-11-27 15:54:08 +02:00
tabbox.h [tabbox] Drop TabBoxClient::window() method 2019-11-18 10:43:41 +02:00
tabbox_logging.cpp
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp
tabboxhandler.h [tabbox] Drop TabBoxClient::window() method 2019-11-18 10:43:41 +02:00
x11_filter.cpp
x11_filter.h