diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-27 16:14:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-27 16:14:40 +0200 |
commit | fc9d8bad753aedfb7193a0f173b05d758e173a51 (patch) | |
tree | d7674a61f620601bcf8081e2cb1a5c8a0a4fc0a8 /setup.py | |
parent | 18b2c9208b16126ffd2f614123cbee7d46d64818 (diff) | |
parent | 898620ed8b4df90f7f8d8d8284937a11658e2fa7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I81d33ae7f72265f152410ccfb55d11a7d34d8902
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions