l10n daemon script 85bc931d72 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"		2018-10-05 05:58:38 +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	2018-10-05 05:58:38 +02:00
scene_qpainter.cpp	[scenes/qpainter] Draw decoration shadows	2018-06-07 12:27:31 +03:00
scene_qpainter.h	[scenes/qpainter] Draw decoration shadows	2018-06-07 12:27:31 +03:00