diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-06-01 22:55:19 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-06-01 22:55:19 (GMT) |
| commit | 0548b4f69d95dbd992cf60c8ab0f1225523b15e1 (patch) | |
| tree | a3669b4d755cc1721681e424513ec7801146b2b3 /tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp | |
| parent | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (diff) | |
| parent | e9ab8493053a7dd56cde058e736f46feafb378d0 (diff) | |
| download | Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.zip Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.tar.gz Qt-0548b4f69d95dbd992cf60c8ab0f1225523b15e1.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.8-from-4.7
Conflicts:
src/declarative/declarative.pro
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
Diffstat (limited to 'tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp')
0 files changed, 0 insertions, 0 deletions