Changeset 7268 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

Timestamp:

01/03/12 11:22:21 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Administrator/3.3

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Recurrence));
       this.gbAppointment = new System.Windows.Forms.GroupBox();
       this.chbade = new System.Windows.Forms.CheckBox();
@@ -243 +242 @@
       this.Controls.Add(this.gbAppointment);
       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       this.Name = "Recurrence";
       this.Text = "Recurrence";

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x