diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-03-18 15:57:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-03-18 16:07:51 +0100 |
| commit | b6f679d77736134dfdfd09403d494448f83eb99c (patch) | |
| tree | 12b52d6de4dd9c4b160e87262a0909cd74652e02 /src/plugins/python/pythonlanguageclient.cpp | |
| parent | 88342a6bba5199ff222550ac22c002b8865fca51 (diff) | |
| parent | 4e47ed66c98709594d6a38a50793ad2aa0cdd00a (diff) | |
| download | qt-creator-b6f679d77736134dfdfd09403d494448f83eb99c.tar.gz | |
Merge remote-tracking branch 'origin/7.0'
Conflicts:
src/plugins/webassembly/webassemblytoolchain.cpp
Change-Id: Ia75c783e3ecab1f97de2b5c73a0979c49da82009
Diffstat (limited to 'src/plugins/python/pythonlanguageclient.cpp')
0 files changed, 0 insertions, 0 deletions