l10n daemon script 196423d267 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-03 06:51:15 +01:00
..
opengl	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-05 05:00:30 +01:00
qpainter	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-03 04:50:14 +01:00
xrender	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-03 06:51:15 +01:00
CMakeLists.txt	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00