l10n daemon script c10fe06d06 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"		2020-06-18 05:44:57 +02:00
..
CMakeLists.txt
scene_xrender.cpp
scene_xrender.h	[scene] Make the scene window a qobject	2020-06-10 09:13:35 +03:00
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00