Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:21:52 +0000 (15:21 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:23:09 +0000 (15:23 +0100)
commit49651307807fc097d14ae13fb71013e46944eb2a
tree3bc227a47f42c2edb7ff4b69fc183b4a99fe0bf3
parent15b232bf694fedf553abac09af077a58ce571f9d
parentf4d4689d3c09cb4eae30be892be426d4fa185ed4
Merge branch 'release' into stable

Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
src/qml/qml/qqmlextensionplugin.cpp
src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc