Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:15:17 +0000 (11:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:15:18 +0000 (11:15 +0200)
commite3b5fcca3826d917076c2d4ab349598dd5799048
tree584ea8df9821d62ca70cd5fedee5b364f0512117
parent7353ed45c65d21444e9f22b7a45179c77e334568
parente0f7b22341339b77aafa9150b0d79e320e9e4180
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I776abad2c248f697ff729057cfaff16b4a395380
src/declarative/qml/qdeclarativecompiler.cpp