Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/03/12 11:22:21 (13 years ago)
Author:
gkronber
Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:
branches/HeuristicLab.TimeSeries
Files:
6 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

    r6866 r7268  
    432432    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Checkout.png" />
    433433    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Clone.png" />
     434    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Information_Large.png" />
     435    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Network_Center_Large.png" />
     436    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png" />
    434437    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
    435438    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Common.Resources/3.3/Plugin.cs.frame

    r6866 r7268  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626
    2727namespace HeuristicLab.Common.Resources {
    28   [Plugin("HeuristicLab.Common.Resources", "3.3.5.$WCREV$")]
     28  [Plugin("HeuristicLab.Common.Resources", "3.3.6.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Common.Resources-3.3.dll", PluginFileType.Assembly)]
    3030  public class HeuristicLabCommonResourcesPlugin : PluginBase {

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Common.Resources/3.3/Properties/AssemblyInfo.cs.frame

    r6866 r7268  
    1111[assembly: AssemblyCompany("")]
    1212[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     13[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    1414[assembly: AssemblyTrademark("")]
    1515[assembly: AssemblyCulture("")]
    … …  
    3131//
    3232[assembly: AssemblyVersion("3.3.0.0")]
    33 [assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
     33[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

    r6558 r7268  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.235
     4//     Runtime Version:4.0.30319.239
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    523523        }
    524524       
     525        public static System.Drawing.Bitmap InformationLarge {
     526            get {
     527                object obj = ResourceManager.GetObject("InformationLarge", resourceCulture);
     528                return ((System.Drawing.Bitmap)(obj));
     529            }
     530        }
     531       
    525532        public static System.Drawing.Bitmap Install {
    526533            get {
    … …  
    593600        }
    594601       
     602        public static System.Drawing.Bitmap MonitorLarge {
     603            get {
     604                object obj = ResourceManager.GetObject("MonitorLarge", resourceCulture);
     605                return ((System.Drawing.Bitmap)(obj));
     606            }
     607        }
     608       
    595609        public static System.Drawing.Bitmap MoveFirst {
    596610            get {
    … …  
    624638            get {
    625639                object obj = ResourceManager.GetObject("Namespace", resourceCulture);
     640                return ((System.Drawing.Bitmap)(obj));
     641            }
     642        }
     643       
     644        public static System.Drawing.Bitmap NetworkCenterLarge {
     645            get {
     646                object obj = ResourceManager.GetObject("NetworkCenterLarge", resourceCulture);
    626647                return ((System.Drawing.Bitmap)(obj));
    627648            }

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

    r6558 r7268  
    508508  <data name="DisplayInColorVertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
    509509    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     510  </data> 
     511  <data name="InformationLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
     512    <value>Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Information_Large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     513  </data>
     514  <data name="MonitorLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
     515    <value>Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     516  </data>
     517  <data name="NetworkCenterLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
     518    <value>Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Network_Center_Large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    510519  </data>
    511520</root>
Note: See TracChangeset for help on using the changeset viewer.