Commit Graph

24 Commits (f1706a454be0a27594e046d51aed6cc89627baf8)
 

Author SHA1 Message Date
Seonjae f1706a454b Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C
# Conflicts:
#	INT63DC_2C.suo
2024-04-23 09:33:51 +09:00
Seonjae 49602a108c no message 2024-04-23 09:30:03 +09:00
DESKTOP-999R8N3\CJY bc2b012313 - Table, 메인화면 하단 숫자들 Tahoma로 재변경 2024-04-18 13:33:30 +09:00
DESKTOP-999R8N3\CJY bc7e2fe38c 버그 수정 2024-04-15 15:34:58 +09:00
Seonjae b8190ad649 예외처리 2024-04-15 15:22:38 +09:00
DESKTOP-999R8N3\CJY 7f079db2e1 버전정보 수정 2024-04-15 13:54:05 +09:00
DESKTOP-999R8N3\CJY 185250257a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	INT63DC_2C.suo
#	INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache
2024-04-15 13:43:24 +09:00
DESKTOP-999R8N3\CJY 8cf0e37d16 글씨체 및 ControlMainDisplay6 이미지수정 2024-04-15 13:41:37 +09:00
Seonjae 4e494b32be no message 2024-04-15 13:30:18 +09:00
Seonjae 38d09e146d 예외처리 2024-04-15 13:29:18 +09:00
Seonjae 5fff589cc1 no message 2024-04-15 13:26:04 +09:00
Seonjae e2c58047df Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C
# Conflicts:
#	INT63DC_2C/obj/Release/INT63DC_2C.csproj.FileListAbsolute.txt
#	INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache
2024-04-15 13:24:30 +09:00
Seonjae f1d955e802 6열 화면 추가 2024-04-15 13:22:25 +09:00
DESKTOP-999R8N3\CJY 25747d6869 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	INT63DC_2C.suo
#	INT63DC_2C/Forms/FormMainDisplay.cs
#	INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache
2024-04-15 11:41:35 +09:00
DESKTOP-999R8N3\CJY 406022ee16 일본어 이미지 추가 및 문구 수정 2024-04-15 11:39:13 +09:00
Seonjae 7706b786ee 일본어 관련 수정 2024-03-29 09:33:31 +09:00
Seonjae 6db3de20bf 일본어 코드 추가 2024-03-19 16:29:50 +09:00
Seonjae 1815561a0e no message 2024-03-12 09:28:05 +09:00
Seonjae 4024a1ee37 예외처리 2024-03-08 15:23:10 +09:00
Seonjae ce7f5b593e no message 2024-03-07 16:10:46 +09:00
Seonjae f5faca4ba5 no message 2024-03-07 15:53:39 +09:00
Seonjae 40a5b35772 no message 2024-03-07 15:46:00 +09:00
Seonjae 048caadfe2 no message 2024-03-07 15:45:20 +09:00
Seonjae 9ba345d192 프로젝트 업로드 2024-03-07 15:43:33 +09:00