aboutsummaryrefslogtreecommitdiffstats
path: root/tests/tests.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-10 18:41:43 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-10 18:41:43 +0100
commitcc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (patch)
tree7314014389e227bd7c9b28d97eebcd072e4852a2 /tests/tests.pro
parentcb2ac154273a8c07a1e4a14246ae22f6e0deaeda (diff)
parent0a74dc69b4c57a15da90be29b598371dfa63f7ee (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/qml/jsruntime/qv4managed_p.h Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
Diffstat (limited to 'tests/tests.pro')
0 files changed, 0 insertions, 0 deletions