l10n daemon script d2aac8cb05 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"		2021-08-01 01:21:11 +00:00
..
CMakeLists.txt	Move source code to src/ directory	2021-02-10 15:31:43 +00:00
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-08-01 01:21:11 +00:00
scene_qpainter.cpp	Remove screenGeometryChanged() in OpenGLBackend and QPainterBackend	2021-07-26 14:55:54 +00:00
scene_qpainter.h	Remove screenGeometryChanged() in OpenGLBackend and QPainterBackend	2021-07-26 14:55:54 +00:00