diff options
| author | Eike Ziller <[email protected]> | 2013-05-24 16:20:10 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-05-24 16:20:10 +0200 |
| commit | d8bd56bcd69dbe484745d2d7b9c5057a50f79d3e (patch) | |
| tree | 38449b739cc5562da083cbd7d1d8dff1d3042e39 /src/libs/cplusplus/OverviewModel.cpp | |
| parent | 8b61a5da2ed70a668b7e85466164bdc233028d11 (diff) | |
| parent | 80e1ae805982c8dd9b34903accb9ed3449337a63 (diff) | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
src/plugins/qbsprojectmanager/qbscleanstep.cpp
src/plugins/qbsprojectmanager/qbsnodes.cpp
src/shared/qbs
Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e
Diffstat (limited to 'src/libs/cplusplus/OverviewModel.cpp')
0 files changed, 0 insertions, 0 deletions