-
由 John Hamby 提交于
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
8497f9ff