- Timestamp:
- 10/02/13 20:11:14 (11 years ago)
- Location:
- stable
- Files:
-
- 2 deleted
- 3 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 10000-10001,10003,10009
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj
r8600 r10021 115 115 <Compile Include="Plugin.cs" /> 116 116 <Compile Include="Properties\AssemblyInfo.cs" /> 117 <Compile Include="VRPInstance ConsumerView.cs">117 <Compile Include="VRPInstanceProviderView.cs"> 118 118 <SubType>UserControl</SubType> 119 119 </Compile> 120 <Compile Include="VRPInstance ConsumerView.designer.cs">121 <DependentUpon>VRPInstance ConsumerView.cs</DependentUpon>120 <Compile Include="VRPInstanceProviderView.designer.cs"> 121 <DependentUpon>VRPInstanceProviderView.cs</DependentUpon> 122 122 </Compile> 123 123 <Compile Include="VRPImportDialog.cs"> … … 182 182 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 183 183 <PropertyGroup> 184 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)184 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 185 185 set ProjectDir=$(ProjectDir) 186 186 set SolutionDir=$(SolutionDir) … … 188 188 189 189 call PreBuildEvent.cmd</PreBuildEvent> 190 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">190 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 191 191 export ProjectDir=$(ProjectDir) 192 192 export SolutionDir=$(SolutionDir) -
stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/Plugin.cs.frame
r9462 r10021 27 27 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 28 28 [PluginDependency("HeuristicLab.MainForm", "3.3")] 29 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]30 29 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 31 30 [PluginDependency("HeuristicLab.Problems.Instances.VehicleRouting", "3.4")] -
stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs
r10001 r10021 30 30 [View("VRP InstanceProvider View")] 31 31 [Content(typeof(IProblemInstanceProvider<IVRPData>), IsDefaultView = true)] 32 public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderView Generic<T> where T : class, IVRPData {32 public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderView<T> where T : class, IVRPData { 33 33 34 34 public VRPInstanceProviderView() {
Note: See TracChangeset
for help on using the changeset viewer.