diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:34:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:36:04 +0100 |
| commit | e6e5e7b2ee668a9e8dec78a6f2c392b338fbaf5c (patch) | |
| tree | d8927e23704c8f530ca640be7037e0e1f08d1879 /qtscript | |
| parent | ed3d7f6cf5c15cf595a3d6b195d03f572085840d (diff) | |
| parent | 05455843158054656296f89051f594a5a5bfdbc0 (diff) | |
| download | qt5-e6e5e7b2ee668a9e8dec78a6f2c392b338fbaf5c.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.gitmodules
coin/provisioning/common/macos/docker_testserver.sh
Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
Diffstat (limited to 'qtscript')
0 files changed, 0 insertions, 0 deletions