diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-03 16:50:35 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-04 10:32:35 +0200 |
| commit | 546b7d16d017c9cffdff731400207177b7499488 (patch) | |
| tree | 377a6c5fdee52dc32c0bf8452ec6d48359f1e626 /tests/test-framework | |
| parent | f6d6b61f0144c52126f0b11edf82e8660efc18c7 (diff) | |
| parent | 59204c3a70b2067f8df39a57bb70a3dfb944a4b7 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
installerfw.pri
src/libs/installer/settings.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
Diffstat (limited to 'tests/test-framework')
0 files changed, 0 insertions, 0 deletions