Merge remote-tracking branch 'origin/master'
# Conflicts: # 2812.ini # setterminal.ini # setterminal_test_15.exe # version.txt
This commit is contained in:
		
						commit
						bcee2612e6
					
				| @ -6,7 +6,7 @@ PixelsPerInch=96 | ||||
| MinMaxPos(2560x1440)=-1,-1,-1,-1 | ||||
| MinMaxPos=-1,-1,-1,-1 | ||||
| NormPos(2560x1440)=511,151,1994,1110 | ||||
| NormPos=2218,54,3701,1013 | ||||
| NormPos=53,0,1536,884 | ||||
| Visible=0 | ||||
| MinMaxPos(1536x864)=-1,-1,-1,-1 | ||||
| NormPos(1536x864)=2218,54,3701,1013 | ||||
| NormPos(1536x864)=53,0,1536,884 | ||||
|  | ||||
| @ -18,3 +18,4 @@ LabelRefreshCanCMDSend_Caption=10 | ||||
| DirectoryEdit10_InitialDir= | ||||
| cbAutoScaleOn_Caption=AutoScaleOn | ||||
| rgSelectAllAnalogInAllTable_ItemIndex=1 | ||||
| cbEnableAnalogTable_Caption=EnableAnalogTable | ||||
|  | ||||
| @ -9,4 +9,4 @@ NormPos(2560x1440)=1046,328,2024,974 | ||||
| NormPos=1046,328,2024,974 | ||||
| Visible=0 | ||||
| MinMaxPos(1536x864)=-1,-1,-1,-1 | ||||
| NormPos(1536x864)=2302,193,3190,839 | ||||
| NormPos(1536x864)=648,156,1536,802 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user