kwin/plugins/scenes
l10n daemon script 4d41e877c3 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-07-23 05:20:30 +02:00
..
opengl SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-23 05:20:30 +02:00
qpainter SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-23 05:20:30 +02:00
xrender SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-23 05:20:30 +02:00
CMakeLists.txt