diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-21 08:34:00 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-21 08:34:00 +0100 |
commit | 88782b9624bc5f79e2d90135b0902aacaab3b08c (patch) | |
tree | 2fba2db72236a970495913a86eed68b4b351cf1f /sources/shiboken2/tests/otherbinding/global.h | |
parent | e41db610955d003bea8b7b456becc0f8ada13655 (diff) | |
parent | f69d163d17d3717c28f2c065173113756d7c50ef (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I63bd30470a624db6b5ec2c7c5148d95c12a071ab
Diffstat (limited to 'sources/shiboken2/tests/otherbinding/global.h')
0 files changed, 0 insertions, 0 deletions