kwin/plugins/scenes
l10n daemon script f597615fa4 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-12 04:58:41 +01:00
..
opengl SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-12 04:58:41 +01:00
qpainter SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-12 04:58:41 +01:00
xrender SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-12 04:58:41 +01:00
CMakeLists.txt