diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:25:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:25:54 +0200 |
| commit | 0464d42b101eaf60c62be751785009d09065f2cf (patch) | |
| tree | 376a542b408469ec63b276ec3d21db935f8d86c5 | |
| parent | 8a781841812a42ed728a76c0dcdcaa6196eac44e (diff) | |
| parent | 5b51eec25ba7e436833feb450efbf5986a6383d7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1v5.7.0
Conflicts:
src/charts/doc/qtcharts.qdocconf
Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de
0 files changed, 0 insertions, 0 deletions