l10n daemon script cf2791803f 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"		2019-10-31 05:34:18 +01:00
..
CMakeLists.txt
scene_xrender.cpp	Delete pointless discardShape method calls	2019-09-30 20:14:57 +03:00
scene_xrender.h
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-31 05:34:18 +01:00