kwin/plugins/scenes
l10n daemon script 3eaf1a9972 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-07-22 07:44:41 +02:00
..
opengl SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
qpainter SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
xrender SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
CMakeLists.txt Move SceneOpenGL into a dedicated plugin 2017-09-30 13:12:10 +02:00