Ignore:
Timestamp:
09/13/13 13:49:03 (8 years ago)
Author:
mkommend
Message:

#2081: Merged path data types into stable.

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Data/3.3

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Data/3.3mergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Data/3.35516-5520
      /branches/Benchmarking/sources/HeuristicLab.Data/3.36917-7005
      /branches/CloningRefactoring/HeuristicLab.Data/3.34656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Data/3.35471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data/3.35815-6180
      /branches/DataAnalysis/HeuristicLab.Data/3.34458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Data/3.36284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data/3.35060
      /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.39668-9706
      /branches/NET40/sources/HeuristicLab.Data/3.35138-5162
      /branches/ParallelEngine/HeuristicLab.Data/3.35175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data/3.37568-7810
      /branches/QAPAlgorithms/HeuristicLab.Data/3.36350-6627
      /branches/Restructure trunk solution/HeuristicLab.Data/3.36828
      /branches/RuntimeOptimizer/HeuristicLab.Data/3.38943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Data/3.37787-8333
      /branches/SlaveShutdown/HeuristicLab.Data/3.38944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Data/3.35370-5682
      /branches/Trunk/HeuristicLab.Data/3.36829-6865
      /branches/UnloadJobs/HeuristicLab.Data/3.39168-9215
      /branches/VNS/HeuristicLab.Data/3.35594-5752
      /branches/histogram/HeuristicLab.Data/3.35959-6341
  • stable/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r8600 r9961  
    117117    <Compile Include="Comparison.cs" />
    118118    <Compile Include="ComparisonType.cs" />
     119    <Compile Include="Path Types\DirectoryValue.cs" />
     120    <Compile Include="Path Types\FileValue.cs" />
     121    <Compile Include="Path Types\PathValue.cs" />
     122    <Compile Include="Path Types\TextFileValue.cs" />
    119123    <Compile Include="PercentMatrix.cs" />
    120124    <Compile Include="PercentArray.cs" />
     
    212216  -->
    213217  <PropertyGroup>
    214    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     218    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    215219set ProjectDir=$(ProjectDir)
    216220set SolutionDir=$(SolutionDir)
     
    219223call PreBuildEvent.cmd
    220224</PreBuildEvent>
    221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     225    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    222226export ProjectDir=$(ProjectDir)
    223227export SolutionDir=$(SolutionDir)
Note: See TracChangeset for help on using the changeset viewer.