diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-23 07:13:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-23 07:13:00 +0100 |
| commit | 1ed7a67a4cef8350103e4ea33b4bbd084f5d4c2d (patch) | |
| tree | 03dd7b6f8d9ccc02da6d0d882793ec62c71b00f7 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | dbb7817e13bc7f7ccb8f04b00a65eb3dcf8d25f8 (diff) | |
| parent | 6a2b17eeec2d171d2afa17bdbc36456346bfd13b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
src/corelib/thread/qthread_unix.cpp
Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
0 files changed, 0 insertions, 0 deletions