diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-16 21:52:48 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-16 21:53:57 +0100 |
commit | 7030adff1869e850a7b983e88d7a773d5d594886 (patch) | |
tree | a3e8ef3ba29c9ea34ee00038595aaa1fe00afe2c /tests/auto/qml/qqmltimer/tst_qqmltimer.cpp | |
parent | 5ba070d305572a7e427a62042967d737bd4791ac (diff) | |
parent | 6ccb9f8f04ea257520e518b25999907c6a8421e1 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id18709cb0a4d85ffdadffa28aef98323367292d4
Diffstat (limited to 'tests/auto/qml/qqmltimer/tst_qqmltimer.cpp')
0 files changed, 0 insertions, 0 deletions