You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script a1c0d43deb 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"
4 years ago
..
CMakeLists.txt
clientmodel.cpp Fix compiler warnings 5 years ago
clientmodel.h
desktopchain.cpp
desktopchain.h
desktopmodel.cpp
desktopmodel.h
kwindesktopswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
kwinwindowswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
switcheritem.cpp
switcheritem.h
tabbox.cpp Move core shade code to AbstractClient 4 years ago
tabbox.h
tabbox_logging.cpp
tabbox_logging.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp
tabboxhandler.h
x11_filter.cpp ScreenEdge: Do not use localtime for measuring duration 5 years ago
x11_filter.h