Skip to content

Commit e981823

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents f6b06a1 + bc9f6e5 commit e981823

File tree

237 files changed

+6675
-10520
lines changed

Some content is hidden

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

237 files changed

+6675
-10520
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ discussed below.
5454
macOS, Ubuntu Linux LTS, and the latest Ubuntu Linux release are the current
5555
supported host development operating systems.
5656

57-
For macOS, you need [Xcode 9.0 beta 1](https://developer.apple.com/xcode/downloads/).
57+
For macOS, you need [Xcode 9.0 beta 2](https://developer.apple.com/xcode/downloads/).
5858

5959
For Ubuntu, you'll need the following development dependencies:
6060

@@ -101,11 +101,11 @@ command line tools to your `PATH`:
101101

102102
#### Ninja
103103
[Ninja](https://ninja-build.org) is the current recommended build system
104-
for building Swift and is the default configuration generated by CMake. If
105-
you're on macOS or don't install it as part of your Linux distribution, clone
106-
it next to the other projects and it will be bootstrapped automatically:
104+
for building Swift and is the default configuration generated by CMake. [Pre-built
105+
packages](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages)
106+
are available for macOS and Linux distributions. You can also clone Ninja
107+
next to the other projects and it will be bootstrapped automatically:
107108

108-
##### Build from source
109109
**Via HTTPS**
110110

111111
git clone https://github.com/ninja-build/ninja.git && cd ninja

apinotes/AVFoundation.apinotes

-243
This file was deleted.

apinotes/AVKit.apinotes

-44
This file was deleted.

0 commit comments

Comments
 (0)