l10n daemon script 145bfd168d 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-28 04:38:13 +02:00
..
CMakeLists.txt
scene_xrender.cpp
scene_xrender.h
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-28 04:38:13 +02:00