tree 85dffdfda30b36e30ce56f8c3959109427b80411
parent 5d885a53fc532510f78a2465b7170d03356fdc63
parent 67444d1bfe38a166f16e12c13a1783680e10d055
author swift-ci <swift-ci@users.noreply.github.com> 1476363997 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1476363997 -0700

Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  [CodeCompletion] Show protocol properties that are accessed through qualified id
  [Sema] Handle transparent_union attributes in C mode only