summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:49:27 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:49:27 +0200
commitf732c38bef5882a92a510fb729160d8a42c908a5 (patch)
tree217061430ea5d96f33076a2656175ec842ea0883
parent51d979ec84a7cdcd777ecde88479ce8692ccf5cd (diff)
parent93d77ed4a310646f470f2f65a4859d392df9eca6 (diff)
downloadqtsvg-f732c38bef5882a92a510fb729160d8a42c908a5.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts: .qmake.conf Change-Id: Iedb8d143caac26003fd3f9a74d1f27d87414591d
0 files changed, 0 insertions, 0 deletions