Changeset 9363 for branches/OaaS/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 3 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.Analysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Analysis.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Analysis.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Analysis.Views 6917-7005 /branches/CMAES/HeuristicLab.Analysis.Views 9141-9257 /branches/CloningRefactoring/HeuristicLab.Analysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Analysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Analysis.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Analysis.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Analysis.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Analysis.Views 5060 /branches/NET40/sources/HeuristicLab.Analysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Analysis.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Analysis.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Analysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Analysis.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Analysis.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Analysis.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Analysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Analysis.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Analysis.Views 9168-9215 /branches/VNS/HeuristicLab.Analysis.Views 5594-5752 /branches/histogram/HeuristicLab.Analysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj
r7978 r9363 116 116 </ItemGroup> 117 117 <ItemGroup> 118 <Compile Include="ScatterPlotVisualPropertiesDialog.cs"> 119 <SubType>Form</SubType> 120 </Compile> 121 <Compile Include="ScatterPlotVisualPropertiesDialog.Designer.cs"> 122 <DependentUpon>ScatterPlotVisualPropertiesDialog.cs</DependentUpon> 123 </Compile> 124 <Compile Include="ScatterPlotVisualPropertiesControl.cs"> 125 <SubType>UserControl</SubType> 126 </Compile> 127 <Compile Include="ScatterPlotVisualPropertiesControl.Designer.cs"> 128 <DependentUpon>ScatterPlotVisualPropertiesControl.cs</DependentUpon> 129 </Compile> 130 <Compile Include="ScatterPlotDataRowVisualPropertiesControl.cs"> 131 <SubType>UserControl</SubType> 132 </Compile> 133 <Compile Include="ScatterPlotDataRowVisualPropertiesControl.Designer.cs"> 134 <DependentUpon>ScatterPlotDataRowVisualPropertiesControl.cs</DependentUpon> 135 </Compile> 118 136 <Compile Include="ScatterPlotView.cs"> 119 137 <SubType>UserControl</SubType> … … 121 139 <Compile Include="ScatterPlotView.Designer.cs"> 122 140 <DependentUpon>ScatterPlotView.cs</DependentUpon> 141 </Compile> 142 <Compile Include="ScatterPlotHistoryView.cs"> 143 <SubType>UserControl</SubType> 144 </Compile> 145 <Compile Include="ScatterPlotHistoryView.Designer.cs"> 146 <DependentUpon>ScatterPlotHistoryView.cs</DependentUpon> 123 147 </Compile> 124 148 <None Include="Plugin.cs.frame" /> … … 278 302 --> 279 303 <PropertyGroup> 280 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)304 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 281 305 set ProjectDir=$(ProjectDir) 282 306 set SolutionDir=$(SolutionDir) … … 285 309 call PreBuildEvent.cmd 286 310 </PreBuildEvent> 311 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 312 export ProjectDir=$(ProjectDir) 313 export SolutionDir=$(SolutionDir) 314 315 $SolutionDir/PreBuildEvent.sh 316 </PreBuildEvent> 287 317 </PropertyGroup> 288 318 </Project>
Note: See TracChangeset
for help on using the changeset viewer.