diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:47 +0100 |
| commit | 509f4fa026ff61ef3c8c9a8e14a585900f3b1fcb (patch) | |
| tree | f5d0187822f653bcaf5e3feda5c5bf6e2e876dcd /sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | |
| parent | 96d8bc01639c3ef83d16a45428758aa0e4420165 (diff) | |
| parent | da5b3470a0ce57f8441485c7b146cdb3c1d2f331 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.cpp')
0 files changed, 0 insertions, 0 deletions