summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:22:44 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:25:31 +0200
commit9aa0edc6d13d20796feb1712883eddb7cd411ecd (patch)
tree75801a4abd760bd2a25a3a15e8de0d251e3584df
parent9c9aadb04199e206e5c7bb6f39f8ae4aabc9c8bc (diff)
parentc7ed28bece292e2745e02663ef519c76d16ec762 (diff)
downloadqtgraphicaleffects-9aa0edc6d13d20796feb1712883eddb7cd411ecd.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5
Conflicts: .qmake.conf Change-Id: I1d337a7aa19c3134ad784c726fc1055c06b3a3d2
0 files changed, 0 insertions, 0 deletions