Skip to content

Commit

Permalink
Merge from 'main' to 'sycl-web' (#2)
Browse files Browse the repository at this point in the history 
  CONFLICT (content): Merge conflict in clang/lib/Frontend/CompilerInvocation.cpp
  CONFLICT (content): Merge conflict in clang/include/clang/Driver/Options.td
  • Loading branch information
@linkren
linkren committed Dec 18, 2020
2 parents 3b90f1b + 383778e commit 729a222
Show file tree
Hide file tree
Showing 5 changed files with 330 additions and 378 deletions.
Loading

0 comments on commit 729a222

Please sign in to comment.