projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb2ac15 0a74dc6)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:41:43 +0000 (18:41 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:41:43 +0000 (18:41 +0100)
Conflicts:
src/qml/jsruntime/qv4managed_p.h

Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f


Trivial merge
Domain: UI Framework / Qt;