summaryrefslogtreecommitdiff
path: root/qtcanvas3d
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-01-22 10:41:17 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-01-22 10:42:38 +0100
commitd758a3b055f822f268fcfa6524f63b611a9fbc26 (patch)
tree53c1b334f849d768a7e987446844a7f0b025cea4 /qtcanvas3d
parentd2b26ede9c43b3543e4dbd3af33acc0b17a36467 (diff)
parent273821d69c58f9c32b4e154dd7cebae1bc481877 (diff)
downloadqt5-d758a3b055f822f268fcfa6524f63b611a9fbc26.tar.gz
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
Diffstat (limited to 'qtcanvas3d')
0 files changed, 0 insertions, 0 deletions