Skip to content

Commit e8ea46f

Browse files
modocachemodocache
committed
Merge branch 'master' into rebase-swiftandroid-onto-trunk-20160107
Many of the conflicts stemmed from FreeBSD support, added in swiftlang#203. Conflicts: - CMakeLists.txt - cmake/modules/AddSwift.cmake - lib/Basic/LangOptions.cpp - lib/Driver/ToolChains.cpp - stdlib/public/Glibc/CMakeLists.txt - stdlib/public/core/CMakeLists.txt - stdlib/public/runtime/CMakeLists.txt - stdlib/public/runtime/Casting.cpp - stdlib/public/stubs/CMakeLists.txt - stdlib/public/stubs/LibcShims.cpp - stdlib/public/stubs/Stubs.cpp - test/CMakeLists.txt - utils/build-script-impl
2 parents 97dfba0 + 1302539 commit e8ea46f

File tree

6,321 files changed

+105344
-101046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,321 files changed

+105344
-101046
lines changed

‎.dir-locals.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
;
33
; This source file is part of the Swift.org open source project
44
;
5-
; Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
5+
; Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
66
; Licensed under Apache License v2.0 with Runtime Library Exception
77
;
88
; See http://swift.org/LICENSE.txt for license information

0 commit comments

Comments
 (0)