diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-05 09:02:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-05 09:02:17 +0200 |
| commit | 45f79dc7e572c1a1e4c40633d5055d0c6741cfbe (patch) | |
| tree | 61147ab31b0be97647417649934461b07ffa6983 /tools | |
| parent | 6839f03051d2950e4721cbb5ee88fa7b07109588 (diff) | |
| parent | ffe113ab628adf6c22e96a22cf0bcda8e80c290d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
Change-Id: I1e6a9424e7f87d9e4ac1ea387ec70e151106f1c7
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions