diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-11-27 12:46:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-11-27 12:46:56 +0100 |
| commit | 8e1fefd8dec89bb782c135c9d5304527aed941db (patch) | |
| tree | 9a0ee6f16fe19f88dcbbd6fcc58bcd280de2d586 /tests/auto/algorithm/tst_algorithm.cpp | |
| parent | 1697f97aff341dbd6b314702fd25ee16a54d6965 (diff) | |
| parent | 63861c44c1e4f9d4cf6a7a48fe9534b4f73d0ad7 (diff) | |
| download | qt-creator-8e1fefd8dec89bb782c135c9d5304527aed941db.tar.gz | |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I29979e76cb01bc94ddcd7868ca1cbc34afb14c5d
Diffstat (limited to 'tests/auto/algorithm/tst_algorithm.cpp')
0 files changed, 0 insertions, 0 deletions