Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Sun, 22 Feb 2015 15:09:45 +0000 (15:09 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 22 Feb 2015 15:09:45 +0000 (15:09 +0000)
commita086f28777f4b168718880248a11424907decbe6
tree0cf35925883e00925e850f3a1510b5806353b1ae
parent76df7e897e567bc4a554da9d0746a8cd6d1ecb95
parent85e94c254a7205ac3e64379f34ca312a6b702234
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5