Ignore:
Timestamp:
10/02/13 20:11:14 (9 years ago)
Author:
abeham
Message:

#2110: merged to stable

Location:
stable
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj

    r8600 r10021  
    115115    <Compile Include="Plugin.cs" />
    116116    <Compile Include="Properties\AssemblyInfo.cs" />
    117     <Compile Include="VRPInstanceConsumerView.cs">
     117    <Compile Include="VRPInstanceProviderView.cs">
    118118      <SubType>UserControl</SubType>
    119119    </Compile>
    120     <Compile Include="VRPInstanceConsumerView.designer.cs">
    121       <DependentUpon>VRPInstanceConsumerView.cs</DependentUpon>
     120    <Compile Include="VRPInstanceProviderView.designer.cs">
     121      <DependentUpon>VRPInstanceProviderView.cs</DependentUpon>
    122122    </Compile>
    123123    <Compile Include="VRPImportDialog.cs">
     
    182182  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    183183  <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)
    185185set ProjectDir=$(ProjectDir)
    186186set SolutionDir=$(SolutionDir)
     
    188188
    189189call PreBuildEvent.cmd</PreBuildEvent>
    190 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     190    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    191191export ProjectDir=$(ProjectDir)
    192192export SolutionDir=$(SolutionDir)
  • stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/Plugin.cs.frame

    r9462 r10021  
    2727  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2828  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    29   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3029  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3130  [PluginDependency("HeuristicLab.Problems.Instances.VehicleRouting", "3.4")]
  • stable/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs

    r10001 r10021  
    3030  [View("VRP InstanceProvider View")]
    3131  [Content(typeof(IProblemInstanceProvider<IVRPData>), IsDefaultView = true)]
    32   public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderViewGeneric<T> where T : class, IVRPData {
     32  public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderView<T> where T : class, IVRPData {
    3333
    3434    public VRPInstanceProviderView() {
Note: See TracChangeset for help on using the changeset viewer.