aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-19 08:23:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-19 08:24:02 +0200
commit8f3fca016b9bdec0975d2f4d17d39782399e3701 (patch)
tree5ea08ba303f82b0fa0e260633f0edc6582e6a53d /sources/shiboken2
parent9d454fbb9808a337dbcc4c9703c1359c8698fff0 (diff)
parent48f179d684d97445c3b6c1426d81915e15049aed (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9
Diffstat (limited to 'sources/shiboken2')
0 files changed, 0 insertions, 0 deletions