diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 16:38:06 +0200 |
| commit | 44073f55632e7848d372a60c4417bbc8664afd2c (patch) | |
| tree | 6fcebed721da0d0049ae1413538e8f6bf9dfbf92 /coin/provisioning/common/macos/python2.sh | |
| parent | 709e687c84c67ba8faf2411c081b29f25d76de4e (diff) | |
| parent | fd87ff83aafc0f103538376591e9f36dfeb1410d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
Diffstat (limited to 'coin/provisioning/common/macos/python2.sh')
0 files changed, 0 insertions, 0 deletions