HomePhabricator

Merge remote-tracking branch 'llvm.org-proper/master' into upstream-with-swift

Authored by jkorous on Jul 9 2019, 4:26 PM.

Description

Merge remote-tracking branch 'llvm.org-proper/master' into upstream-with-swift

  1. Conflicts:
  2. include/clang/DirectoryWatcher/DirectoryWatcher.h
  3. lib/DirectoryWatcher/CMakeLists.txt
  4. unittests/DirectoryWatcher/CMakeLists.txt
  5. unittests/DirectoryWatcher/DirectoryWatcherTest.cpp

apple-llvm-split-commit: 8bb7560123bd9ee6ea17501efa137d4d69e5157d
apple-llvm-split-dir: clang/

Details