summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:29:10 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:29:10 +0200
commit23f263b6aa48644f023df3d463215d98d73b9396 (patch)
treed4eb18088b5ad1b716c30622b7539bfcc3448d24
parent3136d066161e7da700adf9d479f5439668f2e61c (diff)
parentccae23961e65b81b3c16a45d4e186e1e5657a2f6 (diff)
downloadqtsvg-23f263b6aa48644f023df3d463215d98d73b9396.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.1
Conflicts: .qmake.conf Change-Id: I3c55edb069f94a9a48cf036c226d9b7263980d1c
0 files changed, 0 insertions, 0 deletions