| commit | 7a5ed08e9b86700cc09e90c37abf2fab8a269888 | [log] [tgz] |
|---|---|---|
| author | swift-ci <swift-ci@users.noreply.github.com> | Mon Jan 23 09:41:54 2017 -0800 |
| committer | swift-ci <swift-ci@users.noreply.github.com> | Mon Jan 23 09:41:54 2017 -0800 |
| tree | 5af61aad854098ed9dd1d0d5a5a3f5a97005e6e2 | |
| parent | 4949aea661080bc042c227baf1c0a36829a5f187 [diff] | |
| parent | 46b7e9fb147a1cb3b953969e398ec0c06ebf4ee1 [diff] |
Merge remote-tracking branch 'origin/swift-4.0-branch' into stable * origin/swift-4.0-branch: [Sema] UsingShadowDecl shouldn't be hidden by the UsingDecl that owns it