summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-21 11:11:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-01-21 11:11:46 +0100
commit87dfbc6f76fc5c44b636aef417f0c9a95e64077b (patch)
treec7a109e779bce9400c6b8cd51e51233eb886307d /src
parent8cac7eb564232657167bc288ce807f4235cead46 (diff)
parentc092e7b01c7398fb1ec7af3e44e28cc21a809e9e (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions