projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1037a7f 5d4b006)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:05 +0000 (16:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:05 +0000 (16:19 +0200)
Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb

1  2 
src/qml/qml/qqmlengine.cpp patch | diff1 | diff2 | blob | history

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge
Domain: UI Framework / Qt;