Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 6 Mar 2015 12:54:39 +0000 (12:54 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 6 Mar 2015 12:54:39 +0000 (12:54 +0000)
commit1d2d771f552ff43a508ff301ff0906d8d61b729f
tree6a9ece9596f93f0188489b8b86f8dfaef5e6cc5a
parentfc7d3fcb17db5e87fcca7b46a668b1c5a0f2ea06
parentd8c559c4e2fc0b8051be78bd64b8a8fe80b3b78f
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5