Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 12:08:08 +0000 (12:08 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 17 Mar 2015 13:06:23 +0000 (13:06 +0000)
commitb735ba490fa9f43e1d14e356609a85f39e843259
treeda27ac8caeee4cacedeee95a473ac95ac2b6cabc
parent6dc0ba50bab2fa72978a7b5ee63dae9d66e8ad40
parent8d5a2f2a81a001ff64e1a798dc34c61e9ad00b6d
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5