l10n daemon script 8c74b793e0 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-02-11 07:09:43 +01:00
..
CMakeLists.txt
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-11 07:09:43 +01:00
scene_qpainter.cpp
scene_qpainter.h