diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:02 +0100 |
commit | 14f86268e7f149a3c881203227321c3fd085e4d9 (patch) | |
tree | 4265fcd24499859d493f1efd911b73346e7674aa /tests | |
parent | 401cc1f22b5b20386efc099b2498dff9849fecd7 (diff) | |
parent | efe32614d5fed9adaa63630bb5846271364237cb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ieabce3c426cdd9418f5c9b18ef293b14dac23c79
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions