commit | 61cb7f096c227817e3afb08365d3a7ac5db656a5 | [log] [tgz] |
---|---|---|
author | swift-ci <swift-ci@users.noreply.github.com> | Fri Feb 17 09:49:07 2017 -0800 |
committer | swift-ci <swift-ci@users.noreply.github.com> | Fri Feb 17 09:49:07 2017 -0800 |
tree | 506d02875300f22f3b48d1c19410cc82e145ee1f | |
parent | fdc1ad9f3efc1023f440fe12a782c7cfa5becd8b [diff] | |
parent | db7d8d26a585aacc0a77b230d7f3887dbe873dbf [diff] |
Merge remote-tracking branch 'origin/swift-4.0-branch' into stable * origin/swift-4.0-branch: Revert r294910 and recommit r294861 and r294862 with a target triple to hopefully appease the bots.