summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-28 08:29:53 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-08-28 09:18:21 +0000
commit9d71cd48bfc248419035dad811fcfbd317d9b54d (patch)
tree703fb96efdf663e866cc1ca864050ba7c35f87e7 /src
parent47defda4857627bd40834a946529c7eae3ba8b10 (diff)
parentc94109e6123a2c04da5f31c91ede6a155b534f4e (diff)
downloadqtgraphicaleffects-upstream.tar.gz
qtgraphicaleffects-upstream.tar.bz2
qtgraphicaleffects-upstream.zip
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6v5.5.90+alpha1upstream
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions