aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/generator
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-02-13 12:07:58 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-02-13 12:16:53 +0000
commit83c92daf53ec1b039dce012a6f76038debdf4cc0 (patch)
treeaef9103555985cab60af7ea1b853bf15dbd5d7e6 /sources/shiboken2/generator
parent76d677df5eda91894336785789994790ff40b0f1 (diff)
parente9bc6a141fc7c40012a894eaa9bf9aa99d56e9c8 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.9" into refs/staging/5.9
Diffstat (limited to 'sources/shiboken2/generator')
0 files changed, 0 insertions, 0 deletions