Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 29 Dec 2014 15:17:38 +0000 (16:17 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 29 Dec 2014 15:17:38 +0000 (16:17 +0100)
commitf450c31af6da79c6113895b74c7a9023faa77fcd
tree5d9f1488c99536ca0e48c2f6a24f068e76a04dbf
parentb21a66a60875ad453033016ca01e194864ed631c
parent47698fc57fbc66f4b2921eeedb9cb8e71f8fb2d9
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev