HYTOS

개정판 391db12b

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

Change-Id: Ie29e144e73028e0962b11adc1f2512fdb681e6bb

1. Conflicts:
2. DTI_PID/BaseModel/BaseModel.csproj
3. DTI_PID/DTI_PID/TrainingImageListDialog.py
4. DTI_PID/SPPIDConverter/App.config
5. DTI_PID/SPPIDConverter/AutoModeling.cs
6. DTI_PID/SPPIDConverter/BaseModel/ChildSymbol.cs
7. DTI_PID/SPPIDConverter/BaseModel/Document.cs
8. DTI_PID/SPPIDConverter/BaseModel/EndBreak.cs
9. DTI_PID/SPPIDConverter/BaseModel/Equipment.cs
10. DTI_PID/SPPIDConverter/BaseModel/Line.cs
11. DTI_PID/SPPIDConverter/BaseModel/LineNumber.cs
12. DTI_PID/SPPIDConverter/BaseModel/Note.cs
13. DTI_PID/SPPIDConverter/BaseModel/Other/Association.cs
14. DTI_PID/SPPIDConverter/BaseModel/Other/Attribute.cs
15. DTI_PID/SPPIDConverter/BaseModel/Other/Connector.cs
16. DTI_PID/SPPIDConverter/BaseModel/Other/LineNumberRun.cs
17. DTI_PID/SPPIDConverter/BaseModel/Other/Property.cs
18. DTI_PID/SPPIDConverter/BaseModel/SPPID/SPPIDLabelLocationInfo.cs
19. DTI_PID/SPPIDConverter/BaseModel/SPPID/SPPIDLineInfo.cs
20. DTI_PID/SPPIDConverter/BaseModel/SPPID/SPPIDSymbolInfo.cs
21. DTI_PID/SPPIDConverter/BaseModel/Symbol.cs
22. DTI_PID/SPPIDConverter/BaseModel/Text.cs
23. DTI_PID/SPPIDConverter/BaseModel/TrimLine.cs
24. DTI_PID/SPPIDConverter/ConverterDocking.resx
25. DTI_PID/SPPIDConverter/ConverterForm.Designer.cs
26. DTI_PID/SPPIDConverter/ConverterForm.cs
27. DTI_PID/SPPIDConverter/ConverterForm.resx
28. DTI_PID/SPPIDConverter/Form/SPPID_DB_SettingForm.Designer.cs
29. DTI_PID/SPPIDConverter/Project_DB.cs
30. DTI_PID/SPPIDConverter/Project_Info.cs
31. DTI_PID/SPPIDConverter/Properties/Msg.Designer.cs
32. DTI_PID/SPPIDConverter/Properties/Msg.ko.resx
33. DTI_PID/SPPIDConverter/Properties/Msg.resx
34. DTI_PID/SPPIDConverter/Properties/Resources.Designer.cs
35. DTI_PID/SPPIDConverter/Properties/Resources.resx
36. DTI_PID/SPPIDConverter/Resources/ToolbarImage.png
37. DTI_PID/SPPIDConverter/SPPIDConverter.csproj
38. DTI_PID/SPPIDConverter/SPPIDModel/AttributeMapping.cs
39. DTI_PID/SPPIDConverter/SPPIDModel/ChildSymbolMapping.cs
40. DTI_PID/SPPIDConverter/SPPIDModel/ETCSetting.cs
41. DTI_PID/SPPIDConverter/SPPIDModel/Group.cs
42. DTI_PID/SPPIDConverter/SPPIDModel/LineMapping.cs
43. DTI_PID/SPPIDConverter/SPPIDModel/LineNumberMapping.cs
44. DTI_PID/SPPIDConverter/SPPIDModel/SPPID_Document.cs
45. DTI_PID/SPPIDConverter/SPPIDModel/SymbolMapping.cs
46. DTI_PID/SPPIDConverter/Wrapper/SPPIDConverterWrapper.Designer.cs
47. DTI_PID/SPPIDConverter/Wrapper/SPPIDConverterWrapper.cs
48. DTI_PID/SPPIDConverter/Wrapper/SPPIDConverterWrapper.resx
49. DTI_PID/SPPIDConverter/Wrapper/SPPIDConverter_Wrapper.cs
50. DTI_PID/SPPIDConverter/packages.config

파일

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