Changeset 11919 for stable/HeuristicLab.Common.Resources

Timestamp:

02/05/15 17:29:35 (9 years ago)

Author:

ascheibe

Message:

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

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj (modified) (1 diff)
• HeuristicLab.Common.Resources/3.3/Resources/VS2008ImageLibrary/VS2008ImageLibrary_Annotations_Default.png (copied) (copied from trunk/sources/HeuristicLab.Common.Resources/3.3/Resources/VS2008ImageLibrary/VS2008ImageLibrary_Annotations_Default.png)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs (modified) (1 diff)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx (modified) (1 diff)

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

@@ -438 +438 @@
     <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Monitor_Large.png" />
     <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
+    <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />

stable/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

@@ -324 +324 @@
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap Default {
+            get {
+                object obj = ResourceManager.GetObject("Default", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap Delegate {
             get {

stable/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

@@ -524 +524 @@
     <value>Resources\VS2010ImageLibrary\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Annotations_Default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>