Merge "Merge remote-tracking branch 'origin/5.3.1' into 5.3" into refs/staging/5.3
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Jun 2014 12:32:51 +0000 (14:32 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 30 Jun 2014 12:32:51 +0000 (14:32 +0200)
commit98005f912a5165785a7632abe2affb6fe25532fe
tree463ba2fb66a58722db0cba5ed1d0335dc100819b
parent0ca2b46893f73ec1dff9440cd462f9c64b989335
parent0c2b9c3bca67ceb46f838b017176040f7c0921a7
Merge "Merge remote-tracking branch 'origin/5.3.1' into 5.3" into refs/staging/5.3