kwin/effects/presentwindows
l10n daemon script cfd296326b 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-10-23 05:33:32 +02:00
..
CMakeLists.txt
main.qml
presentwindows.cpp
presentwindows.h
presentwindows.kcfg
presentwindows_config.cpp
presentwindows_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 05:33:32 +02:00
presentwindows_config.h
presentwindows_config.ui
presentwindows_proxy.cpp
presentwindows_proxy.h
presentwindowsconfig.kcfgc