kwin/tabbox
l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
clientmodel.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
clientmodel.h Prettify license headers 2020-08-07 19:57:56 +00:00
desktopchain.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
desktopchain.h Prettify license headers 2020-08-07 19:57:56 +00:00
desktopmodel.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
desktopmodel.h Prettify license headers 2020-08-07 19:57:56 +00:00
kwindesktopswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00
kwinwindowswitcher.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00
switcheritem.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
switcheritem.h Prettify license headers 2020-08-07 19:57:56 +00:00
tabbox.cpp Replace remaining usages of old connect syntax with new connect syntax 2020-09-24 09:33:45 +00:00
tabbox.h Prettify license headers 2020-08-07 19:57:56 +00:00
tabbox_logging.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
tabbox_logging.h Prettify license headers 2020-08-07 19:57:56 +00:00
tabboxconfig.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
tabboxconfig.h Prettify license headers 2020-08-07 19:57:56 +00:00
tabboxhandler.cpp Replace remaining usages of old connect syntax with new connect syntax 2020-09-24 09:33:45 +00:00
tabboxhandler.h Prettify license headers 2020-08-07 19:57:56 +00:00
x11_filter.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
x11_filter.h Prettify license headers 2020-08-07 19:57:56 +00:00