Merge remote-tracking branch 'upstream/master' into merge-master-into-future20160505-150019
Conflicts: Makefile src/VisualStudio/CSharp/Impl/CSharpVSResources.resx src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx src/Workspaces/Core/Portable/Workspaces.csproj
Showing
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录