l10n daemon script 6c1447875e 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"		2021-09-24 01:13:57 +00:00
..
opengl	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-24 01:13:57 +00:00
qpainter	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-24 01:13:57 +00:00
CMakeLists.txt	Remove Xrender backend	2021-06-09 11:21:57 +03:00