Context Navigation

← Previous Change
Next Change →

Advanced

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:

: 14 edited

. (modified) (2 props)
HeuristicLab.PluginInfrastructure/3.3/Advanced/AvailablePluginsView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/BasicUpdateView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/ConfirmationDialog.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/ConnectionSetupView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/EditProductsView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseConfirmationDialog.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginUpdaterForm.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.Designer.cs (modified) (1 diff)
HeuristicLab.PluginInfrastructure/3.3/Advanced/UploadPluginsView.Designer.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/GP-MoveOperators

Property svn:ignore

old	new
20	20	bin
21	21	protoc.exe
	22	_ReSharper.HeuristicLab 3.3 Tests

Property svn:mergeinfo changed

/branches/ProblemInstancesRegressionAndClassification (added)	merged: 7568-7572,7603,7605-7607,7610,7664-7667,7682-7685,7687,7698,7748-7755,7757-7759,7770-7774,7794,7805,7809-7810
/trunk/sources (added)	merged: 7811-7812,7814,7823,7825-7826,7828-7830,7834-7836,7841,7846-7847,7849,7851,7857,7860,7862-7863,7867,7869-7870,7872-7875,7877-7880,7885,7892,7895-7898,7900-7901,7904,7906,7908,7910,7915-7917,7919-7921,7923,7926-7928,7932,7934,7937,7943,7947-7949,7955-7957,7960-7961,7964-7967,7969,7971-7972,7974-7981,7983-7988,7990,7995-7996,7999-8000,8004,8006,8008,8011-8016,8019,8021-8023,8026,8028,8030-8031,8040,8042-8044,8046-8047,8049-8053,8055-8062,8065-8067,8069-8078,8080

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/AvailablePluginsView.Designer.cs

r7259	r8085
280	280	//
281	281	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
282		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	282	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
283	283	this.Controls.Add(this.splitContainer);
284	284	this.Name = "RemotePluginInstallerView";

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/BasicUpdateView.Designer.cs

r7259	r8085
67	67	//
68	68	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
69		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	69	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
70	70	this.Controls.Add(this.updateAndInstallButton);
71	71	this.Name = "BasicUpdateView";

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/ConfirmationDialog.Designer.cs

r7259	r8085
130	130	this.AcceptButton = this.okButton;
131	131	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
132		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	132	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
133	133	this.BackColor = System.Drawing.SystemColors.HighlightText;
134	134	this.CancelButton = this.cancelButton;

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/ConnectionSetupView.Designer.cs

r7259	r8085
173	173	this.AcceptButton = this.applyButton;
174	174	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
175		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	175	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
176	176	this.CancelButton = this.cancelButton;
177	177	this.ClientSize = new System.Drawing.Size(488, 183);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/EditProductsView.Designer.cs

r7259	r8085
322	322	//
323	323	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
324		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	324	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
325	325	this.Controls.Add(this.splitContainer);
326	326	this.Name = "ProductEditor";

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.Designer.cs

r7259	r8085
45	45	private void InitializeComponent() {
46	46	components = new System.ComponentModel.Container();
47		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	47	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
48	48	}
49	49

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.Designer.cs

r7259	r8085
263	263	//
264	264	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
265		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	265	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
266	266	this.ClientSize = new System.Drawing.Size(622, 444);
267	267	this.Controls.Add(this.tabControl);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.Designer.cs

r7259	r8085
156	156	//
157	157	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
158		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	158	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
159	159	this.Controls.Add(this.refreshButton);
160	160	this.Controls.Add(this.localPluginsListView);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseConfirmationDialog.Designer.cs

r7259	r8085
169	169	this.AcceptButton = this.acceptButton;
170	170	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
171		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	171	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
172	172	this.BackColor = System.Drawing.SystemColors.HighlightText;
173	173	this.CancelButton = this.rejectButton;

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.Designer.cs

r7259	r8085
62	62	//
63	63	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
64		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	64	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
65	65	this.ClientSize = new System.Drawing.Size(410, 445);
66	66	this.Controls.Add(this.richTextBox);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginUpdaterForm.Designer.cs

r7259	r8085
91	91	this.AcceptButton = this.okButton;
92	92	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
93		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	93	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
94	94	this.ClientSize = new System.Drawing.Size(374, 108);
95	95	this.Controls.Add(this.okButton);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.Designer.cs

r7259	r8085
298	298	//
299	299	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
300		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	300	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
301	301	this.ClientSize = new System.Drawing.Size(687, 565);
302	302	this.Controls.Add(this.showLicenseButton);

branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced/UploadPluginsView.Designer.cs

r7259	r8085
137	137	//
138	138	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
139		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	139	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
140	140	this.Controls.Add(this.listView);
141	141	this.Controls.Add(this.uploadButton);

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.PluginInfrastructure/3.3/Advanced

Legend:

Download in other formats: