Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/11 13:59:25 (13 years ago)
Author:
epitzer
Message:

#1530 integrate changes from trunk

Location:
branches/PersistenceSpeedUp
Files:
6 edited
9 copied

Legend:

Unmodified
Added
Removed

  • branches/PersistenceSpeedUp

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

    r5827 r6760  
    431431    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Checkout.png" />
    432432    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Clone.png" />
     433    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
     434    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
     435    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />
     436    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Started.png" />
     437    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Stopped.png" />
     438    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Paused.png" />
     439    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Prepared.png" />
     440    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Started.png" />
     441    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Stopped.png" />
    433442    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Information.png" />
    434443    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Help.png" />

  • branches/PersistenceSpeedUp/HeuristicLab.Common.Resources/3.3/HeuristicLabCommonResourcesPlugin.cs.frame

    r6099 r6760  
    2626
    2727namespace HeuristicLab.Common.Resources {
    28   [Plugin("HeuristicLab.Common.Resources", "3.3.4.$WCREV$")]
     28  [Plugin("HeuristicLab.Common.Resources", "3.3.5.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Common.Resources-3.3.dll", PluginFileType.Assembly)]
    3030  public class HeuristicLabCommonResourcesPlugin : PluginBase {

  • branches/PersistenceSpeedUp/HeuristicLab.Common.Resources/3.3/Properties/AssemblyInfo.frame

    r6099 r6760  
    3131//
    3232[assembly: AssemblyVersion("3.3.0.0")]
    33 [assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
     33[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

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

    r5827 r6760  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.1
     4//     Runtime Version:4.0.30319.235
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    9696        }
    9797       
     98        public static System.Drawing.Bitmap BatchRunPaused {
     99            get {
     100                object obj = ResourceManager.GetObject("BatchRunPaused", resourceCulture);
     101                return ((System.Drawing.Bitmap)(obj));
     102            }
     103        }
     104       
     105        public static System.Drawing.Bitmap BatchRunPrepared {
     106            get {
     107                object obj = ResourceManager.GetObject("BatchRunPrepared", resourceCulture);
     108                return ((System.Drawing.Bitmap)(obj));
     109            }
     110        }
     111       
     112        public static System.Drawing.Bitmap BatchRunStarted {
     113            get {
     114                object obj = ResourceManager.GetObject("BatchRunStarted", resourceCulture);
     115                return ((System.Drawing.Bitmap)(obj));
     116            }
     117        }
     118       
     119        public static System.Drawing.Bitmap BatchRunStopped {
     120            get {
     121                object obj = ResourceManager.GetObject("BatchRunStopped", resourceCulture);
     122                return ((System.Drawing.Bitmap)(obj));
     123            }
     124        }
     125       
    98126        public static System.Drawing.Bitmap Breakpoint {
    99127            get {
    … …  
    243271        }
    244272       
     273        public static System.Drawing.Bitmap DisplayInColorVertical {
     274            get {
     275                object obj = ResourceManager.GetObject("DisplayInColorVertical", resourceCulture);
     276                return ((System.Drawing.Bitmap)(obj));
     277            }
     278        }
     279       
    245280        public static System.Drawing.Bitmap Document {
    246281            get {
    … …  
    351386            get {
    352387                object obj = ResourceManager.GetObject("Expand", resourceCulture);
     388                return ((System.Drawing.Bitmap)(obj));
     389            }
     390        }
     391       
     392        public static System.Drawing.Bitmap ExperimentPaused {
     393            get {
     394                object obj = ResourceManager.GetObject("ExperimentPaused", resourceCulture);
     395                return ((System.Drawing.Bitmap)(obj));
     396            }
     397        }
     398       
     399        public static System.Drawing.Bitmap ExperimentPrepared {
     400            get {
     401                object obj = ResourceManager.GetObject("ExperimentPrepared", resourceCulture);
     402                return ((System.Drawing.Bitmap)(obj));
     403            }
     404        }
     405       
     406        public static System.Drawing.Bitmap ExperimentStarted {
     407            get {
     408                object obj = ResourceManager.GetObject("ExperimentStarted", resourceCulture);
     409                return ((System.Drawing.Bitmap)(obj));
     410            }
     411        }
     412       
     413        public static System.Drawing.Bitmap ExperimentStopped {
     414            get {
     415                object obj = ResourceManager.GetObject("ExperimentStopped", resourceCulture);
    353416                return ((System.Drawing.Bitmap)(obj));
    354417            }

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

    r5827 r6760  
    230230    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Exception.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    231231  </data>
     232  <data name="BatchRunPrepared" type="System.Resources.ResXFileRef, System.Windows.Forms">
     233    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     234  </data>
     235  <data name="BatchRunStarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
     236    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Started.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     237  </data>
     238  <data name="BatchRunPaused" type="System.Resources.ResXFileRef, System.Windows.Forms">
     239    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     240  </data>
     241  <data name="BatchRunStopped" type="System.Resources.ResXFileRef, System.Windows.Forms">
     242    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Stopped.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     243  </data>
     244  <data name="ExperimentPrepared" type="System.Resources.ResXFileRef, System.Windows.Forms">
     245    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Prepared.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     246  </data>
     247  <data name="ExperimentStarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
     248    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Started.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     249  </data>
     250  <data name="ExperimentPaused" type="System.Resources.ResXFileRef, System.Windows.Forms">
     251    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Paused.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     252  </data>
     253  <data name="ExperimentStopped" type="System.Resources.ResXFileRef, System.Windows.Forms">
     254    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Experiment_Stopped.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     255  </data>
    232256  <data name="ExecutablePaused" type="System.Resources.ResXFileRef, System.Windows.Forms">
    233257    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Executable_Paused.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    … …  
    482506    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_CommonElements_Objects_Zoom_Out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    483507  </data>
     508  <data name="DisplayInColorVertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
     509    <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>
    484511</root>
Note: See TracChangeset for help on using the changeset viewer.