l10n daemon script 30b516eceb 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-09-30 06:16:48 +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	Prettify license headers	2020-08-07 19:57:56 +00:00
scene_xrender.h	Prettify license headers	2020-08-07 19:57:56 +00:00
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00