diff options
| author | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-22 22:13:59 +0000 |
|---|---|---|
| committer | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-22 22:13:59 +0000 |
| commit | 64580d092f1d30328416b3836576fd25b82e5318 (patch) | |
| tree | c08de5e5a1f1d7ecb1fc10b6edc26c6a7dafa243 /src/ProtocolBuffers.sln | |
| parent | a695dfaa5a0dd60d818bd70f1798c651661cba43 (diff) | |
| parent | 57599ef16daeda48381711dae1600cf0c467689d (diff) | |
| download | protobuf-64580d092f1d30328416b3836576fd25b82e5318.tar.gz protobuf-64580d092f1d30328416b3836576fd25b82e5318.tar.bz2 protobuf-64580d092f1d30328416b3836576fd25b82e5318.zip | |
Fixed merge conflicts
Diffstat (limited to 'src/ProtocolBuffers.sln')
| -rw-r--r-- | src/ProtocolBuffers.sln | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ProtocolBuffers.sln b/src/ProtocolBuffers.sln index 1e4820fa..75c07e0f 100644 --- a/src/ProtocolBuffers.sln +++ b/src/ProtocolBuffers.sln @@ -17,6 +17,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoBench", "ProtoBench\Pr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoDump", "ProtoDump\ProtoDump.csproj", "{D7282E99-2DC3-405B-946F-177DB2FD2AE2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "proto", "proto", "{1F896D5C-5FC2-4671-9216-781CB8187EC7}" + ProjectSection(SolutionItems) = preProject + ..\protos\tutorial\addressbook.proto = ..\protos\tutorial\addressbook.proto + ..\protos\google\protobuf\csharp_options.proto = ..\protos\google\protobuf\csharp_options.proto + ..\protos\google\protobuf\descriptor.proto = ..\protos\google\protobuf\descriptor.proto + ..\todo.txt = ..\todo.txt + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU |