diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-21 14:39:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-21 14:39:18 +0200 |
| commit | c2e90c360baaa5b8ea31d4466cadfab2bda3aabe (patch) | |
| tree | 33ff2ee485894273b947b0c89a47dac75c8db3b1 /src/plugins/cpptools/cpppreprocessor_test.cpp | |
| parent | bf69b4c4446fbcc5feb94edcc89ff87078b2afcf (diff) | |
| parent | 01b3e1fa547d8def812d64941968fb5e13516383 (diff) | |
| download | qt-creator-c2e90c360baaa5b8ea31d4466cadfab2bda3aabe.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/projectexplorer/customtoolchain.cpp
src/plugins/vcsbase/command.cpp
Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor_test.cpp')
0 files changed, 0 insertions, 0 deletions