Merge branch 'qtscript-designer' into qtscript
authorAndrey Paskal <apaskal@gmail.com>
Fri, 27 Oct 2017 09:14:51 +0000 (12:14 +0300)
committerAndrey Paskal <apaskal@gmail.com>
Fri, 27 Oct 2017 09:14:51 +0000 (12:14 +0300)
commit5840b823114abbc6d7f8e9162b314f35278041a7
treea8031e23610d9efcd357f000406ac66f0bbfc201
parent99d4093b6da3232aa6d596b43b362a99ec23d2af
parentb2b412d0e6d25a7ff5c757fe1f87f18487ab6aad
Merge branch 'qtscript-designer' into qtscript