diff options
author | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-08-27 07:48:19 +0300 |
---|---|---|
committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-08-27 08:10:02 +0300 |
commit | 5e4d33d8a53ed9df402bf715855e62cbe705621f (patch) | |
tree | 94a7ebd6a9eb2c3ca806124a766b7082c9a5c35c /sources/shiboken2/shibokenmodule | |
parent | 28958dfae22cc6e52dfb71c4b00c20aba72531a1 (diff) | |
parent | b29fb929bbf073e9694340334ff38f15aa9da5bd (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/shiboken2/shibokenmodule')
0 files changed, 0 insertions, 0 deletions