Changeset 9363 for branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/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/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8388-8942 /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/RuntimeOptimizer/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 9168-9215 /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/OaaS/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/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r7675 r9363 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="ALGLIB-3. 5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">96 <HintPath>..\..\bin\ALGLIB-3. 5.0.dll</HintPath>95 <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 96 <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath> 97 97 <Private>False</Private> 98 98 </Reference> … … 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\SymbolicExpressionTreeConstantNodeEditDialog.cs"> 178 <SubType>Form</SubType> 179 </Compile> 180 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs"> 181 <DependentUpon>SymbolicExpressionTreeConstantNodeEditDialog.cs</DependentUpon> 182 </Compile> 183 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeVariableNodeEditDialog.cs"> 184 <SubType>Form</SubType> 185 </Compile> 186 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs"> 187 <DependentUpon>SymbolicExpressionTreeVariableNodeEditDialog.cs</DependentUpon> 188 </Compile> 189 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.cs"> 190 <SubType>Form</SubType> 191 </Compile> 192 <Compile Include="TreeEditDialogs\SymbolicExpressionTreeNodeInsertDialog.Designer.cs"> 193 <DependentUpon>SymbolicExpressionTreeNodeInsertDialog.cs</DependentUpon> 170 194 </Compile> 171 195 <None Include="HeuristicLab.snk" /> … … 313 337 --> 314 338 <PropertyGroup> 315 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)339 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 316 340 set ProjectDir=$(ProjectDir) 317 341 set SolutionDir=$(SolutionDir) … … 320 344 call PreBuildEvent.cmd 321 345 </PreBuildEvent> 346 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 347 export ProjectDir=$(ProjectDir) 348 export SolutionDir=$(SolutionDir) 349 350 $SolutionDir/PreBuildEvent.sh 351 </PreBuildEvent> 322 352 </PropertyGroup> 323 353 </Project>
Note: See TracChangeset
for help on using the changeset viewer.