Conflicts:
	vsprojects/Grpc.mak
	vsprojects/grpc.sln
	vsprojects/grpc/grpc.vcxproj
	vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
	vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
	vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
	vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
	vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
	vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
	vsprojects/grpc_unsecure/grpc_unsecure.vcxproj