Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 18 Sep 2014 11:13:12 +0000 (13:13 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 18 Sep 2014 11:13:12 +0000 (13:13 +0200)
commitd7e26cffac1c52f18be40acd354e9066aea68b9f
treeae73e70d857165082376453dbb7d9ee7536f24f4
parentc9d1965c7c3bd8bca73158d1c07cc888f013b0bd
parent7d02c5e2e9329ef8075d965ce675515345b24dab
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4