kwin/effects/presentwindows
l10n daemon script 3b3aa82f58 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"
2018-07-23 05:24:40 +02:00
..
CMakeLists.txt Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
main.qml
presentwindows.cpp [effects] Ignore previous state of WindowForceBlurRole 2018-06-19 15:23:41 +03:00
presentwindows.h [effects] Ignore previous state of WindowForceBlurRole 2018-06-19 15:23:41 +03:00
presentwindows.kcfg [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
presentwindows_config.cpp [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
presentwindows_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
presentwindows_config.h
presentwindows_config.ui
presentwindows_proxy.cpp
presentwindows_proxy.h
presentwindowsconfig.kcfgc