kwin/tabbox
l10n daemon script ec2204fbe1 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 09:28:27 +01:00
..
clientmodel.cpp Port away from deprecated qVariantFromValue 2019-09-18 16:20:06 +03:00
clientmodel.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
desktopchain.cpp
desktopchain.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
desktopmodel.cpp Port away from deprecated qVariantFromValue 2019-09-18 16:20:06 +03:00
desktopmodel.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
kwindesktopswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-29 09:28:27 +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 Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
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 Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
tabboxhandler.cpp [tabbox] Delete unused X11 includes 2019-09-07 12:45:28 +03:00
tabboxhandler.h [tabbox] Drop TabBoxClient::window() method 2019-11-18 10:43:41 +02:00
x11_filter.cpp
x11_filter.h