diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 23:03:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 23:03:51 +0200 |
| commit | b7ac036b727784624cf33f5f11b8d2d1b6f16538 (patch) | |
| tree | 3214d3689d3de3f5a770d96529d58d4e03424d1f /util | |
| parent | 967e4f258cd39991fd2d0ac3753544900d51fbc2 (diff) | |
| parent | a7297ed85bc58a1f242b49a643e3abbdc7cf7e24 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/network/socket/qabstractsocket.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
src/sql/drivers/mysql/qsql_mysql.cpp
Change-Id: Ifb73623d09f53340ee5e10283f1f86b580998902
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions