Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 18 Mar 2015 09:55:14 +0000 (09:55 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 18 Mar 2015 13:11:51 +0000 (13:11 +0000)
commit7b0c98138e171b6b51297b5944616a3eead30feb
tree6aa4610b6800fbd1fad0e9f71e11a6520f2dee56
parent3119e7edc2c72e6aa4134153e29c07ab9609215a
parent7232472c82dcba653ba010fd0d05da13a7fb5dec
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev