diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-19 08:55:52 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-19 08:55:52 +0200 |
commit | ac8e4f0d05aef867c9ce5c8fdb7337b04f8c64dc (patch) | |
tree | 4779ba642115573c0b0c1077063b37db2b4f4b72 /sources/shiboken2/ApiExtractor/abstractmetalang.cpp | |
parent | cdc8e97c2120c4e93435ce3dad648f5e5fa8d6fc (diff) | |
parent | 3f7bb2243ab294e6daf48ac567faef5468b3477d (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8f58e0ed19ad967366cf647eacd8b3d737d8b56a
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetalang.cpp')
0 files changed, 0 insertions, 0 deletions