개정판 5529d2a2
Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Conflicts:
- MarkupToPDF/Common/GetUserSign.cs
- MarkupToPDF/Controls/Cad/ClipWhiteControlcs.cs
- MarkupToPDF/Controls/Cad/CoordinateControl.cs
- MarkupToPDF/Controls/Cad/InsideWhiteControlcs.cs
- MarkupToPDF/Controls/Cad/OverlapWhiteControlcs.cs
- MarkupToPDF/Controls/Etc/DateControl.cs
- MarkupToPDF/Controls/Etc/ImgControl.cs
- MarkupToPDF/Controls/Etc/SignControl.cs
- MarkupToPDF/Controls/Etc/SymControl.cs
- MarkupToPDF/Controls/Etc/SymControlN.cs
- MarkupToPDF/Controls/Line/ArcControl.cs
- MarkupToPDF/Controls/Line/ArrowArcControl.cs
- MarkupToPDF/Controls/Line/ArrowControl_Multi.cs
- MarkupToPDF/Controls/Line/LineControl.cs
- MarkupToPDF/Controls/Parsing/MarkupCopy.cs
- MarkupToPDF/Controls/Parsing/MarkupParse.cs
- MarkupToPDF/Controls/Polygon/CloudControl.cs
- MarkupToPDF/Controls/Polygon/InkControl.cs
- MarkupToPDF/Controls/Polygon/PolygonControl.cs
- MarkupToPDF/Controls/Shape/CircleControl.cs
- MarkupToPDF/Controls/Shape/RectCloudControl.cs
- MarkupToPDF/Controls/Shape/RectangleControl.cs
- MarkupToPDF/Controls/Shape/TriControl.cs
- MarkupToPDF/Controls/Text/ArrowTextControl.cs
- MarkupToPDF/Controls/Text/TextControl.cs
revised issue #999: Add FromString to all of controls
Change-Id: I9647b70731951d39e792367ae8e95e4d5b6de585
파일
- 추가됨
- 변경됨
- 복사됨
- 이름바뀜
- 삭제됨