l10n daemon script 866dfb4e89 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-01-14 07:04:00 +01:00
..
CMakeLists.txt
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
scene_qpainter.cpp	Provide expected presentation time to effects	2020-12-10 07:14:42 +00:00
scene_qpainter.h	platformsupport: Set PUBLIC include directories	2021-01-07 09:49:26 +00:00