l10n daemon script c04c285b6a 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-12-03 04:50:14 +01:00
..
CMakeLists.txt
scene_xrender.cpp
scene_xrender.h
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-03 04:50:14 +01:00