kwin/effects/slide
l10n daemon script 1e09646791 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-01-22 06:35:04 +01:00
..
CMakeLists.txt [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00
slide.cpp [effects/slide] Handle moving clients 2018-01-01 17:12:52 +02:00
slide.h [effects/slide] Handle moving clients 2018-01-01 17:12:52 +02:00
slide.kcfg [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00
slide_config.cpp [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00
slide_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-22 06:35:04 +01:00
slide_config.h [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00
slide_config.ui [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00
slideconfig.kcfgc [effects/slide] Add 'Duration' option 2018-01-01 16:54:02 +02:00