l10n daemon script 6c1447875e 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-09-24 01:13:57 +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-09-24 01:13:57 +00:00
scene_qpainter.cpp	Port screenId based rendering methods to AbstractOutput	2021-08-25 13:53:33 +02:00
scene_qpainter.h	Port screenId based rendering methods to AbstractOutput	2021-08-25 13:53:33 +02:00