diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 11:10:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 11:10:59 +0200 |
| commit | eb78767825dc120287081d60ada53a89f9a67498 (patch) | |
| tree | 48c62d649a25b2a27e02cdfd129a64e330c0c8cc /qtqa | |
| parent | bc65857c5872eee34de5a238f66c781570cb4f3d (diff) | |
| parent | 792f91dc8754ea906eea1268f55e66256c2c97a9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
coin/provisioning/common/helpers.ps1
Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
Diffstat (limited to 'qtqa')
0 files changed, 0 insertions, 0 deletions