Merge remote-tracking branch 'origin/master'

# Conflicts:
#	2812.ini
#	setterminal.ini
#	setterminal_test_15.exe
#	version.txt
This commit is contained in:
2025-01-22 16:49:23 +03:00
3 changed files with 4 additions and 3 deletions

View File

@@ -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