프로젝트

일반

사용자정보

« 뒤로 | 다음 » 

개정판 5529d2a2

ID5529d2a20f3452cdfa6b1fb0c1de2a29e69a0c7e
상위 661b7416, 308a8b7c
하위 cb33ad14

백흠경이(가) 5년 이상 전에 추가함

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS

  1. Conflicts:
  2. MarkupToPDF/Common/GetUserSign.cs
  3. MarkupToPDF/Controls/Cad/ClipWhiteControlcs.cs
  4. MarkupToPDF/Controls/Cad/CoordinateControl.cs
  5. MarkupToPDF/Controls/Cad/InsideWhiteControlcs.cs
  6. MarkupToPDF/Controls/Cad/OverlapWhiteControlcs.cs
  7. MarkupToPDF/Controls/Etc/DateControl.cs
  8. MarkupToPDF/Controls/Etc/ImgControl.cs
  9. MarkupToPDF/Controls/Etc/SignControl.cs
  10. MarkupToPDF/Controls/Etc/SymControl.cs
  11. MarkupToPDF/Controls/Etc/SymControlN.cs
  12. MarkupToPDF/Controls/Line/ArcControl.cs
  13. MarkupToPDF/Controls/Line/ArrowArcControl.cs
  14. MarkupToPDF/Controls/Line/ArrowControl_Multi.cs
  15. MarkupToPDF/Controls/Line/LineControl.cs
  16. MarkupToPDF/Controls/Parsing/MarkupCopy.cs
  17. MarkupToPDF/Controls/Parsing/MarkupParse.cs
  18. MarkupToPDF/Controls/Polygon/CloudControl.cs
  19. MarkupToPDF/Controls/Polygon/InkControl.cs
  20. MarkupToPDF/Controls/Polygon/PolygonControl.cs
  21. MarkupToPDF/Controls/Shape/CircleControl.cs
  22. MarkupToPDF/Controls/Shape/RectCloudControl.cs
  23. MarkupToPDF/Controls/Shape/RectangleControl.cs
  24. MarkupToPDF/Controls/Shape/TriControl.cs
  25. MarkupToPDF/Controls/Text/ArrowTextControl.cs
  26. MarkupToPDF/Controls/Text/TextControl.cs

revised issue #999: Add FromString to all of controls

Change-Id: I9647b70731951d39e792367ae8e95e4d5b6de585

파일

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

클립보드 이미지 추가 (최대 크기: 500 MB)