l10n daemon script b9f5aa3cf6 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"		2017-11-07 04:44:27 +01:00
..
opengl	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-07 04:44:27 +01:00
qpainter
xrender
CMakeLists.txt