Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

This commit is contained in:
Doug Gregor
2015-12-18 10:15:47 -08:00
171 changed files with 1361 additions and 594 deletions

View File

@@ -19,7 +19,7 @@
// contiguous sequence of `Element`s.
//
// - `Array<Element>` is like `ContiguousArray<Element>` when `Element` is not
// an reference type or an Objective-C existential. Otherwise, it may use
// a reference type or an Objective-C existential. Otherwise, it may use
// an `NSArray` bridged from Cocoa for storage.
//
//===----------------------------------------------------------------------===//