l10n daemon script cf2791803f 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-10-31 05:34:18 +01: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	2019-10-31 05:34:18 +01:00
scene_qpainter.cpp	Rename geometry property to frameGeometry	2019-10-02 11:46:37 +03:00
scene_qpainter.h	[libkwineffects] Introduce API to easily show a QtQuick scene in an effect	2019-09-27 16:11:05 +01:00