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)
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf

1  2 
src/qml/jsruntime/qv4arrayobject.cpp
src/quick/items/qquickitem.cpp

Simple merge
Simple merge