diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-06 12:20:44 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-06 12:20:44 +0200 |
| commit | a4d714e23d3472a86e39458e7b21d7a71c3d4203 (patch) | |
| tree | 689ca1874cda715b6a7a40c35e1a429c919b9201 /src/plugins/cpptools/cpptoolseditorsupport.h | |
| parent | 872f87f5e96de8042f2f9b0354ff9f3abbfdf7af (diff) | |
| parent | c77c392cb981505b4cae48a272403c0b36b3bce9 (diff) | |
| download | qt-creator-a4d714e23d3472a86e39458e7b21d7a71c3d4203.tar.gz | |
Merge branch '2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
tests/system/shared/project.py
tests/system/suite_general/tst_create_proj_wizard/test.py
Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.h')
0 files changed, 0 insertions, 0 deletions