diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-17 16:06:59 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-17 16:09:00 +0200 |
commit | 40196663ea7e9d1a55c0991bfee593d02a992fd7 (patch) | |
tree | cfa99c89541488bf42c5709c95e33df2149a6fe0 /sources/shiboken2/shiboken_version.py | |
parent | ac5d069b678bb95cd509e22c8ae9f5ef4ae0f838 (diff) | |
parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6ae8b985c0f83b43ac6a763a87e553d44ec27865
Diffstat (limited to 'sources/shiboken2/shiboken_version.py')
0 files changed, 0 insertions, 0 deletions