Alexandru Croitor 26c5243491 Merge remote-tracking branch 'origin/dev' into wip/cmake ... Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641		2020-03-12 15:03:03 +01:00
..
content	Fix vertical position of PathText	2020-01-29 14:45:41 +01:00
doc	Fix outdated FDL license header	2017-12-14 13:25:47 +00:00
CMakeLists.txt	Post-merge fixes	2020-01-30 20:45:49 +00:00
main.cpp	Fix outdated BSD license header	2017-12-14 13:25:45 +00:00
shapes.pro	Introduce PathText path element	2020-01-21 11:48:54 +01:00
shapes.qrc	Introduce PathText path element	2020-01-21 11:48:54 +01:00