Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
Bob Wilson
2016-12-04 18:16:09 -08:00
8165 changed files with 42927 additions and 33031 deletions

View File

@@ -5,8 +5,8 @@
// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See http://swift.org/LICENSE.txt for license information
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//