Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorSergio Ahumada <sahumada@texla.cl>
Sun, 22 Feb 2015 22:21:39 +0000 (22:21 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 22 Feb 2015 22:21:39 +0000 (22:21 +0000)
commite7e34562fe4264dd84e246aa5b12ad14d8eb9021
tree8dd459f66b18a0096848e86cfb7edc3815312ccf
parente5ffc6a876631bf27feee793734209271db82bd9
parentf9014d136f504c6377d1329c822f11a8b58ccdbe
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev