l10n daemon script bc45ff1458 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"		2017-09-02 04:55:23 +02:00
..
qpainter	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-02 04:55:23 +02:00
xrender	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-02 04:55:23 +02:00
CMakeLists.txt