- Timestamp:
- 05/15/12 13:54:24 (12 years ago)
- Location:
- trunk/sources
- Files:
-
- 2 deleted
- 3 edited
-
. (modified) (1 prop)
-
HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
-
HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs (deleted)
-
HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs (deleted)
-
HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/ProblemInstancesRegressionAndClassification (added) merged: 7568-7572,7603,7605-7607,7610,7664-7667,7682-7685,7687,7698,7748-7755,7757-7759,7770-7774,7794,7805,7809-7810
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views 5815-6180 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views 6284-6795 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views 5175-5192 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views 6828 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views 6829-6865 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r7641 r7823 129 129 </Compile> 130 130 <Compile Include="Plugin.cs" /> 131 <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs"> 132 <SubType>UserControl</SubType> 133 </Compile> 134 <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs"> 135 <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon> 136 </Compile> 131 137 <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs"> 132 138 <SubType>UserControl</SubType> … … 135 141 <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon> 136 142 </Compile> 137 <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs"> 138 <SubType>UserControl</SubType> 139 </Compile> 140 <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs"> 141 <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon> 143 <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs"> 144 <SubType>UserControl</SubType> 145 </Compile> 146 <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs"> 147 <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon> 148 </Compile> 149 <Compile Include="Regression\RegressionSolutionLineChartView.cs"> 150 <SubType>UserControl</SubType> 151 </Compile> 152 <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs"> 153 <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon> 142 154 </Compile> 143 155 <Compile Include="Regression\RegressionSolutionResidualHistogram.cs"> … … 146 158 <Compile Include="Regression\RegressionSolutionResidualHistogram.Designer.cs"> 147 159 <DependentUpon>RegressionSolutionResidualHistogram.cs</DependentUpon> 160 </Compile> 161 <Compile Include="Regression\RegressionSolutionScatterPlotView.cs"> 162 <SubType>UserControl</SubType> 163 </Compile> 164 <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs"> 165 <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon> 148 166 </Compile> 149 167 <Compile Include="Solution Views\ClassificationSolutionView.cs"> … … 238 256 <Compile Include="Solution Views\RegressionSolutionView.Designer.cs"> 239 257 <DependentUpon>RegressionSolutionView.cs</DependentUpon> 240 </Compile>241 <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">242 <SubType>UserControl</SubType>243 </Compile>244 <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">245 <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>246 </Compile>247 <Compile Include="Regression\RegressionSolutionLineChartView.cs">248 <SubType>UserControl</SubType>249 </Compile>250 <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">251 <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>252 </Compile>253 <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">254 <SubType>UserControl</SubType>255 </Compile>256 <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">257 <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>258 </Compile>259 <Compile Include="DataAnalysisProblemView.cs">260 <SubType>UserControl</SubType>261 </Compile>262 <Compile Include="DataAnalysisProblemView.Designer.cs">263 <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>264 258 </Compile> 265 259 <None Include="HeuristicLab.snk" /> … … 371 365 <Install>true</Install> 372 366 </BootstrapperPackage> 367 </ItemGroup> 368 <ItemGroup> 369 <Folder Include="obj\" /> 373 370 </ItemGroup> 374 371 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset
for help on using the changeset viewer.
