diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-06-16 11:48:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-06-16 11:48:08 +0200 |
| commit | 905f5d4e1b5784001138f2acbbad0ed9c49aa714 (patch) | |
| tree | cd0d03ed5a5293f359db970006d34bcd484b3296 /src/plugins/python/pythonutils.cpp | |
| parent | e3c03fd3c5d6a20748a260b9952c84aadbf03be5 (diff) | |
| parent | 8ec23e44a2b85a83f3b17ee05191d47006c83727 (diff) | |
| download | qt-creator-905f5d4e1b5784001138f2acbbad0ed9c49aa714.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
coin/instructions/common_environment.yaml
Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
Diffstat (limited to 'src/plugins/python/pythonutils.cpp')
0 files changed, 0 insertions, 0 deletions