l10n daemon script 44f6b70245 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-12-07 05:38:05 +01:00
..
CMakeLists.txt
scene_xrender.cpp	Drop some custom list typedefs	2019-11-27 15:54:08 +02:00
scene_xrender.h	Drop some custom list typedefs	2019-11-27 15:54:08 +02:00
xrender.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-07 05:38:05 +01:00