- Timestamp:
- 09/13/13 13:49:03 (11 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 9714,9833,9841,9850,9949
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Data/3.3
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Data/3.3 merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Data/3.3 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data/3.3 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data/3.3 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Data/3.3 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data/3.3 5815-6180 /branches/DataAnalysis/HeuristicLab.Data/3.3 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Data/3.3 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data/3.3 5060 /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3 9668-9706 /branches/NET40/sources/HeuristicLab.Data/3.3 5138-5162 /branches/ParallelEngine/HeuristicLab.Data/3.3 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data/3.3 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data/3.3 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data/3.3 6828 /branches/RuntimeOptimizer/HeuristicLab.Data/3.3 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data/3.3 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data/3.3 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Data/3.3 5370-5682 /branches/Trunk/HeuristicLab.Data/3.3 6829-6865 /branches/UnloadJobs/HeuristicLab.Data/3.3 9168-9215 /branches/VNS/HeuristicLab.Data/3.3 5594-5752 /branches/histogram/HeuristicLab.Data/3.3 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj
r8600 r9961 117 117 <Compile Include="Comparison.cs" /> 118 118 <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" /> 119 123 <Compile Include="PercentMatrix.cs" /> 120 124 <Compile Include="PercentArray.cs" /> … … 212 216 --> 213 217 <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) 215 219 set ProjectDir=$(ProjectDir) 216 220 set SolutionDir=$(SolutionDir) … … 219 223 call PreBuildEvent.cmd 220 224 </PreBuildEvent> 221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">225 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 222 226 export ProjectDir=$(ProjectDir) 223 227 export SolutionDir=$(SolutionDir)
Note: See TracChangeset
for help on using the changeset viewer.