| commit | 66bdbae2a768dcb66e97e02e858c310aeb2248ff | [log] [tgz] |
|---|---|---|
| author | Frederic Riss <friss@apple.com> | Tue Feb 14 16:03:53 2017 -0800 |
| committer | Frederic Riss <friss@apple.com> | Tue Feb 14 16:03:53 2017 -0800 |
| tree | 482182006c8ca66cff165d01bcf53d0e695d7b42 | |
| parent | 6d174f96529ed86bc3463053e0b495796a2e4449 [diff] | |
| parent | 77a08a4030acb0db81ed9bc123792ef54db75088 [diff] |
Merge branch 'release_40' of http://llvm.org/git/clang into swift-4.0-branch Fix a merge conflict in a comment. Conflicts: lib/AST/ExprConstant.cpp