aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2
blob: 70b88893e95589dc5c42638e0dff1b408e1d1c32 (plain)
1
2
3
4
5
6
7
tree 6feea1660cf298412e57f0da7b387e766db00d91
parent 432c5d89977a345e57d25a1f3cdd7b4851bd7354
parent 87d96dfc108499817896fd198ecb3b016f8b5feb
author Christian Tismer <ctismer@gmail.com> 1437975616 +0200
committer Christian Tismer <ctismer@gmail.com> 1437975616 +0200

Merge branch 'gbaty-fix_qtcore_dep_in_tests' into qt5