diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-26 09:40:39 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-26 13:04:32 +0200 |
| commit | 2fb026d58b45f50ed7d5666de58c9184e81bbc60 (patch) | |
| tree | ad1a80d7e2579899c55fce7771472a7d9176af0e /src/corelib/json/qjson.cpp | |
| parent | 184b2ea4ea9c3e4ad735ff67c5a399e9613da8ab (diff) | |
| parent | 540978288ea0f6ed0b166bb9207f427a4c825ab6 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Conflicts:
src/corelib/tools/qsimd_p.h
src/network/socket/qnativesocketengine_winrt.cpp
Change-Id: I2765b671664c2a84839b2f88ba724fdf0c1fa7c6
Diffstat (limited to 'src/corelib/json/qjson.cpp')
0 files changed, 0 insertions, 0 deletions