Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 21:28:29 +0000 (21:28 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 10 Feb 2015 21:28:29 +0000 (21:28 +0000)
commit638c278b76c56a51f83ef8c5cc9c03f18a887f74
tree343a565c3f1cf6a4598f60a464393726ffa8dae9
parenta44897902130c68626dab450fce1a9e3be8baae1
parent2c49b07f88b5f3eee17ccbdbf2a2e7e1dc43a4bb
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4