diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-02 12:22:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-02 12:22:03 +0200 |
| commit | 37ab6e6d0381978d56290319c292e39c8e5edeb8 (patch) | |
| tree | ab7eb141fc14620a519c4dd6a33b46e58f1fbaef /src/plugins/cpptools/cpppreprocessor_test.cpp | |
| parent | 954c61ff584537d27e1d5974b2b9f488971ae52f (diff) | |
| parent | 0f05aa42daec491b46195a51eb0cd03bb4aa249a (diff) | |
| download | qt-creator-37ab6e6d0381978d56290319c292e39c8e5edeb8.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/shared/qbs
Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor_test.cpp')
0 files changed, 0 insertions, 0 deletions