l10n daemon script 8027ccd6d6 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-17 16:54:45 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 16:54:45 +02:00
scene_qpainter.cpp	[scene] Build window pixmap trees before starting rendering	2020-05-04 15:36:03 +03:00
scene_qpainter.h	[scene] Build window pixmap trees before starting rendering	2020-05-04 15:36:03 +03:00