l10n daemon script 29915632df 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-04 05:12:36 +02:00
..
CMakeLists.txt	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
scene_xrender.cpp	scene: Pass non-trivial classes by const&	2020-03-14 01:15:04 +01:00
scene_xrender.h	scene: Pass non-trivial classes by const&	2020-03-14 01:15:04 +01:00
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-04 05:12:36 +02:00