l10n daemon script 6a676d6fab 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-09-16 06:53:13 +02:00
..
CMakeLists.txt
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-16 06:53:13 +02:00
scene_qpainter.cpp
scene_qpainter.h