aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/shiboken_version.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-06-08 11:09:32 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-06-08 12:05:31 +0000
commit9bf80d1b4b2aa9930bfee41b874ede0e204e3324 (patch)
treecaf112a361f6923c8a29c64eb616b803efae748f /sources/shiboken2/shiboken_version.py
parentbda686d4cb32e8295b483bb14d205cbc56a1a65a (diff)
parent12756772e3971f9b832435b1221aef4e32d6970a (diff)
Merge "Merge branch '5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'sources/shiboken2/shiboken_version.py')
0 files changed, 0 insertions, 0 deletions