##// 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:

r2734:69f73db4ec09
r2893:0464d42b101e merge 5.7.0
Show More
.gitattributes
5 lines | 189 B | text/plain | TextLexer
.tag export-subst
.gitignore export-ignore
.gitattributes export-ignore
.commit-template export-ignore
tools export-ignore