Skip to content

Commit d0192a0

Browse files
committed
Merge from 'master' to 'sycl-web' (#2)
CONFLICT (content): Merge conflict in clang/utils/TableGen/TableGen.cpp
2 parents da93b6e + 09c6259 commit d0192a0

File tree

12 files changed

+327
-377
lines changed

12 files changed

+327
-377
lines changed

clang/include/clang/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ add_subdirectory(Parse)
55
add_subdirectory(Sema)
66
add_subdirectory(Serialization)
77
add_subdirectory(StaticAnalyzer/Checkers)
8-
add_subdirectory(Tooling/Syntax)

clang/include/clang/Tooling/Syntax/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)