l10n daemon script 4d41e877c3 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"		2019-07-23 05:20:30 +02:00
..
CMakeLists.txt	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
qpainter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-23 05:20:30 +02:00
scene_qpainter.cpp	Port away from QRegion::rects	2019-07-10 01:00:51 +03:00
scene_qpainter.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00