Changeset 8954 for branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
- Timestamp:
- 11/27/12 20:09:33 (11 years ago)
- Location:
- branches/SlaveShutdown
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SlaveShutdown
- Property svn:mergeinfo changed
/trunk/sources (added) merged: 8946-8948,8950,8952
- Property svn:mergeinfo changed
-
branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged eligible /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5060 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6828 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 7787-8333 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6829-6865 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 4 obj 3 *.user4 HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r8600 r8954 114 114 </ItemGroup> 115 115 <ItemGroup> 116 <Compile Include="InteractiveSymbolicExpressionTreeChart.cs"> 117 <SubType>UserControl</SubType> 118 </Compile> 119 <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs"> 120 <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon> 121 </Compile> 116 122 <Compile Include="MathSymbolicDataAnalysisModelView.cs"> 117 123 <SubType>UserControl</SubType> … … 168 174 <Compile Include="Symbols\VariableView.Designer.cs"> 169 175 <DependentUpon>VariableView.cs</DependentUpon> 176 </Compile> 177 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeChangeValueDialog.cs"> 178 <SubType>Form</SubType> 179 </Compile> 180 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeChangeValueDialog.Designer.cs"> 181 <DependentUpon>SymbolicExpressionTreeNodeChangeValueDialog.cs</DependentUpon> 182 </Compile> 183 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.cs"> 184 <SubType>Form</SubType> 185 </Compile> 186 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.Designer.cs"> 187 <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon> 170 188 </Compile> 171 189 <None Include="HeuristicLab.snk" /> … … 313 331 --> 314 332 <PropertyGroup> 315 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)333 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 316 334 set ProjectDir=$(ProjectDir) 317 335 set SolutionDir=$(SolutionDir) … … 320 338 call PreBuildEvent.cmd 321 339 </PreBuildEvent> 322 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">340 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 323 341 export ProjectDir=$(ProjectDir) 324 342 export SolutionDir=$(SolutionDir)
Note: See TracChangeset
for help on using the changeset viewer.