tree 2ce3782184824a51ef1aaa1741e55e09ab1f3722
parent 4caa7532f923e759093df9227df20a36a002d28d
parent 9a18d7b7e5fade75cf3ca55aca1e730453c2554b
author swift-ci <swift-ci@users.noreply.github.com> 1478555358 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1478555358 -0800

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

* origin/swift-3.1-branch:
  [index] Handle properly C++14's template variables.
  [index] Make sure to mark class template symbols as having 'generic' sub-kind.