Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/11 16:45:46 (14 years ago)
Author:
mkommend
Message:

#1418: Merged trunk changes into branch.

Location:
branches/DataAnalysis Refactoring/HeuristicLab.Common.Resources/3.3
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis Refactoring/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

    r5432 r5796  
    431431    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Checkout.png" />
    432432    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Clone.png" />
     433    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_HiddenField.png" />
    433434    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Actions_Filter.png" />
    434435    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_Cab.png" />

  • branches/DataAnalysis Refactoring/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

    r5287 r5796  
    425425        }
    426426       
     427        public static System.Drawing.Bitmap HiddenField {
     428            get {
     429                object obj = ResourceManager.GetObject("HiddenField", resourceCulture);
     430                return ((System.Drawing.Bitmap)(obj));
     431            }
     432        }
     433       
    427434        public static System.Drawing.Bitmap HighPriorityLarge {
    428435            get {

  • branches/DataAnalysis Refactoring/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

    r5432 r5796  
    275275    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Graph.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    276276  </data>
     277  <data name="HiddenField" type="System.Resources.ResXFileRef, System.Windows.Forms">
     278    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_HiddenField.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     279  </data>
    277280  <data name="HighPriorityLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
    278281    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations&amp;Buttons_HighPriority_Large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Note: See TracChangeset for help on using the changeset viewer.