l10n daemon script f6e32f5ba1 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-10-24 05:16:57 +02:00
..
CMakeLists.txt
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-24 05:16:57 +02:00
scene_qpainter.cpp
scene_qpainter.h