diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-08-20 13:12:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-08-20 13:12:25 +0200 |
| commit | 92bdd2b7fa42b8f43bd1a5238a1d0fca9a46145e (patch) | |
| tree | d6a0925f1f97b4f4a599ca14d5708b0d3c28bda0 /src/libs/cplusplus/OverviewModel.cpp | |
| parent | 4706765af97c0d388537d960f9e3766636d82026 (diff) | |
| parent | f1774930cc79ac10526478dd75257e5bc884c46b (diff) | |
| download | qt-creator-92bdd2b7fa42b8f43bd1a5238a1d0fca9a46145e.tar.gz | |
Merge remote-tracking branch 'origin/2.5' into 2.6
Conflicts:
src/plugins/coreplugin/progressmanager/progressmanager_win.cpp
Change-Id: I7c5168894bd202f9fec8fd3278fad8c3b4f4449c
Diffstat (limited to 'src/libs/cplusplus/OverviewModel.cpp')
0 files changed, 0 insertions, 0 deletions