HYTOS

개정판 0a7f879c

Merge branch 'HYTOS' of ssh://devdoftech.co.kr:29418/DTIPID

1. Conflicts:
2. DTI_PID/BaseModel/Project_DB.cs
3. DTI_PID/DTI_PID/OcrResultDialog.py
4. DTI_PID/DTI_PID/OcrResultDialog_UI.py
5. DTI_PID/SPPIDConverter/AutoModeling.cs
6. DTI_PID/SPPIDConverter/ConverterForm.Designer.cs
7. DTI_PID/SPPIDConverter/ConverterForm.cs
8. DTI_PID/SPPIDConverter/DB/SPPID_DB.cs
9. DTI_PID/SPPIDConverter/Form/MappingForm.Designer.cs
10. DTI_PID/SPPIDConverter/Form/MappingForm.cs

Change-Id: I6d3fecc71ff2e0b28a2a05c9c156e791d48c77a6

파일

• 추가됨
• 변경됨
• 복사됨
• 이름바뀜
• 삭제됨