aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2
blob: aec629295a7470396432cfbf8175e3020949904f (plain)
1
2
3
4
5
6
7
8
9
tree f5a2463628f9d1006f871146e9dbdfa29405443d
parent 23bd1aa6e016e7523978ef9c8f1c84289249f7f2
parent e2faf27b08fc109d6a0d32cc86c9fd6d48beadec
author Christian Tismer <ctismer@gmail.com> 1442755187 +0200
committer Christian Tismer <ctismer@gmail.com> 1442755187 +0200

Merge branch 'master' of https://github.com/PySide/shiboken2 into o11c-primitive-type-name

* 'master' of https://github.com/PySide/shiboken2: