l10n daemon script 880d0afcf1 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-11-04 06:13:10 +01:00
..
qpainter	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-04 06:13:10 +01:00
xrender	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-04 06:13:10 +01:00
CMakeLists.txt	Move QPainter compositor into plugin	2017-09-01 17:44:49 +02:00