diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:53:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:53:25 +0200 |
| commit | b05603a44d67d1cfa080a16ae774485d26152f4f (patch) | |
| tree | 7ecee36d5e79b657b52385d463f1906c7aa71a9f /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | fbdbd11aa3b5af5d3c966571ba3e44f1587c3b77 (diff) | |
| parent | 7724bd467388f6ae3b8a4cbc8609f535a94a03f1 (diff) | |
| download | qt-creator-b05603a44d67d1cfa080a16ae774485d26152f4f.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
qtcreator.pri
Change-Id: I6726277830ddbd3b21391b5c5e48880929a2d725
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
0 files changed, 0 insertions, 0 deletions