Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/21/12 18:02:33 (12 years ago)
Author:
gkronber
Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:
branches/GP-MoveOperators
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r7832 r8085  
    148148  </ItemGroup>
    149149  <ItemGroup>
    150     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    151       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    152       <Name>HeuristicLab.Analysis-3.3</Name>
    153       <Private>False</Private>
    154     </ProjectReference>
    155     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    156       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    157       <Name>HeuristicLab.Collections-3.3</Name>
    158       <Private>False</Private>
    159     </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    161       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    162       <Name>HeuristicLab.Common-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    166       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    167       <Name>HeuristicLab.Core-3.3</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    171       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    172       <Name>HeuristicLab.Data-3.3</Name>
    173       <Private>False</Private>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    176       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    177       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    178       <Private>False</Private>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    181       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    182       <Name>HeuristicLab.Operators-3.3</Name>
    183       <Private>False</Private>
    184     </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    186       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    187       <Name>HeuristicLab.Optimization-3.3</Name>
    188       <Private>False</Private>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    191       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    192       <Name>HeuristicLab.Parameters-3.3</Name>
    193       <Private>False</Private>
    194     </ProjectReference>
    195     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    196       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    197       <Name>HeuristicLab.Persistence-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    201       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    202       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    206       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    207       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    208       <Private>False</Private>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    211       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    212       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    213       <Private>False</Private>
    214     </ProjectReference>
    215   </ItemGroup>
    216   <ItemGroup>
    217150    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    218151      <Visible>False</Visible>
    … …  
    230163      <Install>true</Install>
    231164    </BootstrapperPackage>
     165  </ItemGroup>
     166  <ItemGroup>
     167    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     168      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     169      <Name>HeuristicLab.Analysis-3.3</Name>
     170      <Private>False</Private>
     171    </ProjectReference>
     172    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     173      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     174      <Name>HeuristicLab.Collections-3.3</Name>
     175      <Private>False</Private>
     176    </ProjectReference>
     177    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     178      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     179      <Name>HeuristicLab.Common-3.3</Name>
     180      <Private>False</Private>
     181    </ProjectReference>
     182    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     183      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     184      <Name>HeuristicLab.Core-3.3</Name>
     185      <Private>False</Private>
     186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     188      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     189      <Name>HeuristicLab.Data-3.3</Name>
     190      <Private>False</Private>
     191    </ProjectReference>
     192    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     193      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     194      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     195      <Private>False</Private>
     196    </ProjectReference>
     197    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     198      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     199      <Name>HeuristicLab.Operators-3.3</Name>
     200      <Private>False</Private>
     201    </ProjectReference>
     202    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     203      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     204      <Name>HeuristicLab.Optimization-3.3</Name>
     205      <Private>False</Private>
     206    </ProjectReference>
     207    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     208      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     209      <Name>HeuristicLab.Parameters-3.3</Name>
     210      <Private>False</Private>
     211    </ProjectReference>
     212    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     213      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     214      <Name>HeuristicLab.Persistence-3.3</Name>
     215      <Private>False</Private>
     216    </ProjectReference>
     217    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     218      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     219      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     220      <Private>False</Private>
     221    </ProjectReference>
     222    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     223      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     224      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     225      <Private>False</Private>
     226    </ProjectReference>
     227    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     228      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     229      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     230      <Private>False</Private>
     231    </ProjectReference>
     232    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     233      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     234      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     235      <Private>False</Private>
     236    </ProjectReference>
    232237  </ItemGroup>
    233238  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.