kwin/plugins/scenes
l10n daemon script cf2791803f 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-10-31 05:34:18 +01:00
..
opengl SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-31 05:34:18 +01:00
qpainter SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-31 05:34:18 +01:00
xrender SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-31 05:34:18 +01:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00