Commit Graph

18 Commits (9954d8f14a2f808fd958a31dfa94b682f4865074)
 

Author SHA1 Message Date
sj84 9954d8f14a Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A
# Conflicts:
#	INT69DB_2A/Forms/FormUserEditor.Designer.cs
#	INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll
2023-09-08 11:23:27 +09:00
sj84 0601b152c3 no message 2023-09-08 11:22:53 +09:00
DESKTOP-999R8N3\CJY d88b1aac3a Part11 추가 및 수정 중 2023-09-08 11:21:51 +09:00
DESKTOP-999R8N3\CJY abde305ebe 버그수정&코드추가 2023-09-06 17:38:25 +09:00
DESKTOP-999R8N3\CJY b908f2b75b Part11 업데이트 중 2023-09-01 18:03:40 +09:00
DESKTOP-999R8N3\CJY 11be29edca 데이터 통계 진행 중(추후 코드 15인치 프로그램 따라갈 예정) 2023-08-30 10:41:13 +09:00
DESKTOP-999R8N3\CJY d41c5775ad Part11 추가 중 2023-08-28 13:07:51 +09:00
DESKTOP-999R8N3\CJY abc54d880c Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A
# Conflicts:
#	INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll
2023-08-16 10:53:28 +09:00
DESKTOP-999R8N3\CJY 87c56b9399 Part11 추가 중 2023-08-16 10:52:36 +09:00
sj84 dade5fd21a Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A
# Conflicts:
#	INT69DB_2A.suo
#	INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll
2023-08-16 09:30:10 +09:00
sj84 ca1dddebf0 예외처리 추가 2023-08-16 09:28:06 +09:00
DESKTOP-999R8N3\CJY ba87e9b677 Part11 추가 중 2023-08-14 17:45:01 +09:00
DESKTOP-999R8N3\CJY 4a4272e2b2 Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A
# Conflicts:
#	INT69DB_2A/bin/Release/INT69DB_2A.exe
#	INT69DB_2A/bin/Release/INT69DB_2A.pdb
#	INT69DB_2A/obj/Release/INT69DB_2A.csproj.GenerateResource.Cache
#	INT69DB_2A/obj/Release/INT69DB_2A.exe
#	INT69DB_2A/obj/Release/INT69DB_2A.pdb
2023-08-14 09:33:30 +09:00
DESKTOP-999R8N3\CJY da7eff26f9 Part11 추가 중 2023-08-14 09:32:08 +09:00
sj84 265ccc6d0b 추적 중지 파일 등록 2023-08-07 11:40:00 +09:00
sj84 9346ee56d8 예외처리 추가
bin, obj 폴더
2023-08-07 11:37:29 +09:00
DESKTOP-999R8N3\CJY 5711da36b6 Disable 이미지 추가 2023-08-04 18:05:07 +09:00
DESKTOP-999R8N3\CJY 02fe8680a8 INT69DB_2A V5.0.0 2023-07-21 13:40:29 +09:00