##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2712:c544258484ff
r2893:0464d42b101e merge 5.7.0
Show More
sundata.qrc
5 lines | 104 B | text/plain | TextLexer
<RCC>
<qresource prefix="/">
<file alias="sun">sun_spots.txt</file>
</qresource>
</RCC>