diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:55:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 10:12:27 +0100 |
| commit | 8a3dae92910e9df5817d9cde16aef81e76bfc60f (patch) | |
| tree | eb2e7986005ed03188e764a047b74e197bbb531d /tools | |
| parent | 6fa9b98c7d67b4ffd7d859ad54b8213675c0e4bb (diff) | |
| parent | cef09e6345d245b47eb115d438f6e367503d57f6 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/scxml/trafficlight-common/TrafficLight.qml
tools/qscxmlc/doc/qscxmlc.qdoc
tools/qscxmlc/scxmlcppdumper.cpp
Change-Id: I1452fa6a24486fb33f70b49eff593a925894f8da
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions