diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-15 10:12:27 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-15 10:38:08 +0100 |
| commit | e7cec8e77fa3dadb24d71135a965065c5fc5ff73 (patch) | |
| tree | 8f7998d6fec27f18e64d3858a2b9299bb824564b /share | |
| parent | 49a051bd4b320aff32066181932dc27a4eea63c5 (diff) | |
| parent | 4142c7a911f59a135911cce51e0179625e06595f (diff) | |
Merge remote-tracking branch 'origin/1.1'
Conflicts:
tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
tests/auto/blackbox/tst_blackbox.cpp
Change-Id: I7b5e72e0a360d7e5e814a1f6e344bf11eac767e6
Diffstat (limited to 'share')
0 files changed, 0 insertions, 0 deletions