Context Navigation

RunCollectionConstraintViews

Timestamp:

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

Author:

gkronber

Message:

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

Location:

branches/GP-MoveOperators

Files:

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

r7469	r8085
118	118	//
119	119	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
120		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	120	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
121	121	this.Controls.Add(this.cmbConstraintColumn);
122	122	this.Controls.Add(this.chbActive);

r7469	r8085
71	71	//
72	72	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
73		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	73	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
74	74	this.Controls.Add(this.txtConstraintData);
75	75	this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);

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

r7469	r8085
76	76	//
77	77	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
78		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	78	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
79	79	this.Controls.Add(this.runsView);
80	80	this.Controls.Add(this.chbActive);

r7469	r8085
61	61	//
62	62	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
63		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	63	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
64	64	this.Controls.Add(this.txtConstraintData);
65	65	this.Name = "RunCollectionEqualityConstraintView";

r7469	r8085
63	63	//
64	64	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
65		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	65	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
66	66	this.Controls.Add(this.cmbType);
67	67	this.Name = "RunCollectionTypeCompatibilityConstraintView";

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