diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
| commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
| tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /sources/shiboken2/shiboken_version.py | |
| parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
| parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'sources/shiboken2/shiboken_version.py')
0 files changed, 0 insertions, 0 deletions