aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2
blob: 581433711a65382b018a8984b48435eb000ba3af (plain)
1
2
3
4
5
6
7
8
9
tree e213f6365447eb6fb47a28cf76deffa8fe18253e
parent b5c6084d9e4a4b02a245c8ae6ff058dfc04789a9
parent d93870c10c546b1cca5ce339dd42e55d6081c52b
author Christian Tismer <ctismer@gmail.com> 1447442706 +0100
committer Christian Tismer <ctismer@gmail.com> 1447442706 +0100

Merge branch 'webengine' of https://github.com/empyrical/pyside2 into empyrical-webengine

Fixed broken dependencies. (wrong name)