- 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.Views/3.3
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Data.Views/3.3 merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Data.Views/3.3 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data.Views/3.3 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data.Views/3.3 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Data.Views/3.3 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data.Views/3.3 5815-6180 /branches/DataAnalysis/HeuristicLab.Data.Views/3.3 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Data.Views/3.3 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data.Views/3.3 5060 /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data.Views/3.3 9669-9706 /branches/NET40/sources/HeuristicLab.Data.Views/3.3 5138-5162 /branches/ParallelEngine/HeuristicLab.Data.Views/3.3 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data.Views/3.3 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data.Views/3.3 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data.Views/3.3 6828 /branches/RuntimeOptimizer/HeuristicLab.Data.Views/3.3 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data.Views/3.3 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Data.Views/3.3 5370-5682 /branches/Trunk/HeuristicLab.Data.Views/3.3 6829-6865 /branches/UnloadJobs/HeuristicLab.Data.Views/3.3 9168-9215 /branches/VNS/HeuristicLab.Data.Views/3.3 5594-5752 /branches/histogram/HeuristicLab.Data.Views/3.3 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r9379 r9961 133 133 <DependentUpon>IntRangeView.cs</DependentUpon> 134 134 </Compile> 135 <Compile Include="Path Views\DirectoryValueView.cs"> 136 <SubType>UserControl</SubType> 137 </Compile> 138 <Compile Include="Path Views\DirectoryValueView.Designer.cs"> 139 <DependentUpon>DirectoryValueView.cs</DependentUpon> 140 </Compile> 141 <Compile Include="Path Views\FileValueView.cs"> 142 <SubType>UserControl</SubType> 143 </Compile> 144 <Compile Include="Path Views\FileValueView.Designer.cs"> 145 <DependentUpon>FileValueView.cs</DependentUpon> 146 </Compile> 147 <Compile Include="Path Views\TextFileView.cs"> 148 <SubType>UserControl</SubType> 149 </Compile> 150 <Compile Include="Path Views\TextFileView.Designer.cs"> 151 <DependentUpon>TextFileView.cs</DependentUpon> 152 </Compile> 135 153 <Compile Include="Plugin.cs" /> 136 154 <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs"> … … 196 214 </ItemGroup> 197 215 <ItemGroup> 216 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 217 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project> 218 <Name>HeuristicLab.Common.Resources-3.3</Name> 219 <Private>False</Private> 220 </ProjectReference> 198 221 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 199 222 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
Note: See TracChangeset
for help on using the changeset viewer.