Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 22 May 2014 17:59:58 +0000 (19:59 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 22 May 2014 17:59:58 +0000 (19:59 +0200)
commit8a28462c13907800caf44c16580e0b2a2ee99f69
treee6d1e5d9179dac8edb4d87017442ef8194c80cac
parentb3c2c28746a01f435580b9fbad64d4f614e7f805
parent800025fb70ace453275011c1ae5ce906e0fa3344
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
src/qml/compiler/qv4ssa.cpp