diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-14 15:19:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-14 15:19:26 +0200 |
commit | 9115712ef3a1be8b401c9cd306792dbc30c89bf0 (patch) | |
tree | 264121693cd1fbf183b8b8cc8bdba99fb9d34350 /sources/shiboken2/libshiboken/basewrapper.cpp | |
parent | dfdaea19982a8d5851095f3abe0b792bc733ba10 (diff) | |
parent | f6519b1d343bc26a53374d3066e90495f1959c78 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id9ab658ea9dcc1e61502892fcbc270166f6151de
Diffstat (limited to 'sources/shiboken2/libshiboken/basewrapper.cpp')
0 files changed, 0 insertions, 0 deletions