Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Tue, 28 Apr 2015 12:27:02 +0000 (12:27 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 28 Apr 2015 12:27:02 +0000 (12:27 +0000)
commitbc79a3e19598c4491f8cdc9ccd004dd26ffa1da5
tree059587b11701bf86ab7f7c6a4c3b074a5c71cde6
parent55dc72f8cf47c6b32c1f172f4dffcd5a3bc743e6
parent94db5de2acefb6e96d4f6cfda2df14905a5e63c5
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev