kwin/effects/scale
l10n daemon script af34144f7f 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-08-14 05:54:05 +02:00
..
CMakeLists.txt [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale.cpp [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale.h [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale.kcfg [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale_config.cpp [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-14 05:54:05 +02:00
scale_config.h [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scale_config.ui [effects] Add Scale effect 2018-08-12 10:57:41 +03:00
scaleconfig.kcfgc [effects] Add Scale effect 2018-08-12 10:57:41 +03:00