diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-20 16:20:51 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-20 16:21:38 +0100 |
| commit | 7221ed82d292fc20007b0d1a7953efd28fff3d22 (patch) | |
| tree | d3677f2cdc790e6585f3e414376a42b9fcc82657 /src/imports | |
| parent | 4b25972f9b478677ad2ba816f9601117acde8f19 (diff) | |
| parent | 5135ffaf2a9d6969f2a113041d8d336e397bc661 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions