Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Wed, 8 Jan 2014 17:18:04 +0000 (18:18 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Wed, 8 Jan 2014 17:18:53 +0000 (18:18 +0100)
commit40722a7eaf6bb6d77d730dc3f8510718e2cad549
tree1c3dec7b83ebd2bef910075889dc2c39697933ea
parenta9bef84675f6b67bb88a2bb99e45aba889795251
parent2f9099443d9acd6583e92785afbb38b2e4dcbfd5
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
src/qml/jsruntime/qv4arrayobject.cpp
src/quick/items/qquickitem.cpp