Ignore:
Timestamp:
02/05/15 17:29:35 (6 years ago)
Author:
ascheibe
Message:

#2031 merged revisions 11703,11704,11705,11706,11715,11717,11725,11757,11837,11914 into stable

Location:
stable
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

    r9079 r11919  
    438438    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png" />
    439439    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
     440    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png" />
    440441    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
    441442    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />
  • stable/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

    r9079 r11919  
    324324        ///   Looks up a localized resource of type System.Drawing.Bitmap.
    325325        /// </summary>
     326        public static System.Drawing.Bitmap Default {
     327            get {
     328                object obj = ResourceManager.GetObject("Default", resourceCulture);
     329                return ((System.Drawing.Bitmap)(obj));
     330            }
     331        }
     332       
     333        /// <summary>
     334        ///   Looks up a localized resource of type System.Drawing.Bitmap.
     335        /// </summary>
    326336        public static System.Drawing.Bitmap Delegate {
    327337            get {
  • stable/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

    r9079 r11919  
    524524    <value>Resources\VS2010ImageLibrary\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    525525  </data>
     526  <data name="Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     527    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     528  </data>
    526529</root>
Note: See TracChangeset for help on using the changeset viewer.