blob: 35348484553ca9f3d8e6efb049b936b946e5141b (
plain)
1
2
3
4
5
6
7
8
9
10
|
tree bb4ebaa43073a7f4da99e18bcfddb0defb804c5e
parent 0e14dac9dd4326919ab62d24b0b0f8d1e9bf418a
parent 2c2223a1da3994448cb714e415cd4be4f94698ca
author Christian Tismer <tismer@stackless.com> 1443051474 +0200
committer Christian Tismer <tismer@stackless.com> 1443051474 +0200
Merge branch 'master' of https://github.com/PySide/pyside2
Conflicts:
PySide2/QtCore/typesystem_core_win.xml
|
