aboutsummaryrefslogtreecommitdiffstats
path: root/qtscxml
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-02-24 15:41:16 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-02-24 15:41:16 +0000
commit30236c3f152303ab883517743cc93f3a2382ca61 (patch)
tree5943d7f0f789f9aa77b473c65b40a1f442605db8 /qtscxml
parent18e84e7c06cab6158040346e6c7229eb92333026 (diff)
parentd4bb78696363384b4b1ac8bedaba3eba47f1a5ef (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'qtscxml')
0 files changed, 0 insertions, 0 deletions