Nikolai Kosjar
|
216f110385
|
Clang: Tests on MSVC2013: Fix file name clashes
The following files conflicted:
src\tools\clangbackend\ipcsource\translationunit.cpp
src\libs\3rdparty\cplusplus\TranslationUnit.cpp
src\libs\3rdparty\cplusplus\Type.cpp
src\tools\clangbackend\ipcsource\type.cpp
src\libs\3rdparty\cplusplus\Symbol.cpp
src\plugins\clangcodemodel\symbol.cpp
Change-Id: If7865570cd70e39e25cc8d508f771c8023288f0c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
|
2015-11-26 13:54:21 +00:00 |
|