HomePhabricator

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

Authored by jkorous on Jul 12 2019, 3:33 PM.

Description

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

  1. Conflicts:
  2. lib/DirectoryWatcher/CMakeLists.txt
  3. lib/DirectoryWatcher/linux/DirectoryWatcher-linux.cpp
  4. unittests/DirectoryWatcher/CMakeLists.txt
  5. unittests/DirectoryWatcher/DirectoryWatcherTest.cpp

apple-llvm-split-commit: c1b987e89be037f5b03b3db2b4de4d2104c60911
apple-llvm-split-dir: clang/

Merged Changes

CommitAuthorDetailsCommitted
000ba715ddbdjkorous
[DirectoryWatcher][NFC] Silence warnings in release build 
Jul 12 2019