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/ProtoGen/ProtoGen.csproj | |
| 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/ProtoGen/ProtoGen.csproj')
| -rw-r--r-- | src/ProtoGen/ProtoGen.csproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ProtoGen/ProtoGen.csproj b/src/ProtoGen/ProtoGen.csproj index 100db99f..228d6932 100644 --- a/src/ProtoGen/ProtoGen.csproj +++ b/src/ProtoGen/ProtoGen.csproj @@ -34,6 +34,7 @@ <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> + <StartupObject>Google.ProtocolBuffers.ProtoGen.ProgramPreprocess</StartupObject> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -79,6 +80,7 @@ <Compile Include="MessageFieldGenerator.cs" /> <Compile Include="MessageGenerator.cs" /> <Compile Include="PrimitiveFieldGenerator.cs" /> + <Compile Include="ProgramPreprocess.cs" /> <Compile Include="RepeatedEnumFieldGenerator.cs" /> <Compile Include="RepeatedMessageFieldGenerator.cs" /> <Compile Include="RepeatedPrimitiveFieldGenerator.cs" /> |