summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-19 17:53:31 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-19 17:53:31 +0200
commit5b4931309de0d033af339674edddcddbbb11949b (patch)
tree7edb90e7c4461d9b62bdf30771ad49e51ba92370
parent05f945009ba5693eda78a09aa1e1dfbaa8ce3fca (diff)
parent1434a793c97bd5746679b6b278d03b441a851674 (diff)
downloadqtgraphicaleffects-5b4931309de0d033af339674edddcddbbb11949b.tar.gz
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I7289625e062c5ce4126c240b459057258793dd85
0 files changed, 0 insertions, 0 deletions