Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.Common.Resources

Timestamp:

06/21/12 18:02:33 (13 years ago)

Author:

gkronber

Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj (modified) (1 diff)
• HeuristicLab.Common.Resources/3.3/Resources/VS2010ImageLibrary/VS2010ImageLibrary_Actions_SaveAsHH.png (copied) (copied from trunk/sources/HeuristicLab.Common.Resources/3.3/Resources/VS2010ImageLibrary/VS2010ImageLibrary_Actions_SaveAsHH.png)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs (modified) (2 diffs)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx (modified) (2 diffs)

branches/GP-MoveOperators

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/GP-MoveOperators/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

@@ -430 +430 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\VS2010ImageLibrary\VS2010ImageLibrary_Actions_SaveAsHH.png" />
+    <None Include="Resources\SaveAs.bmp" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Checkout.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Clone.png" />

branches/GP-MoveOperators/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.239
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -838 +838 @@
         }
         
+        public static System.Drawing.Bitmap SaveAs {
+            get {
+                object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         public static System.Drawing.Bitmap Script {
             get {

branches/GP-MoveOperators/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

@@ -508 +508 @@
   <data name="DisplayInColorVertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>  
+  </data>
   <data name="InformationLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\VS2010ImageLibrary\VS2010ImageLibrary_Objects_Information_Large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -518 +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>
   </data>
+  <data name="SaveAs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\VS2010ImageLibrary\VS2010ImageLibrary_Actions_SaveAsHH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests