Skip to content
  • Teodor Gelu Chiciudean's avatar
    Merge remote-tracking branch 'upstream/master' · d010e085
    Teodor Gelu Chiciudean authored
    
    
    Conflicts:
    	documentation/unified-doc/gdl-documentation.log
    	documentation/unified-doc/yadd/geom-base/angular-dimension.texi
    	documentation/unified-doc/yadd/geom-base/arc.texi
    	documentation/unified-doc/yadd/geom-base/base-drawing.texi
    	documentation/unified-doc/yadd/geom-base/base-object.texi
    	documentation/unified-doc/yadd/geom-base/base-view.texi
    	documentation/unified-doc/yadd/geom-base/bezier-curve.texi
    	documentation/unified-doc/yadd/geom-base/box.texi
    	documentation/unified-doc/yadd/geom-base/c-cylinder.texi
    	documentation/unified-doc/yadd/geom-base/center-line.texi
    	documentation/unified-doc/yadd/geom-base/circle.texi
    	documentation/unified-doc/yadd/geom-base/cone.texi
    	documentation/unified-doc/yadd/geom-base/cylinder.texi
    	documentation/unified-doc/yadd/geom-base/ellipse.texi
    	documentation/unified-doc/yadd/geom-base/general-note.texi
    	documentation/unified-doc/yadd/geom-base/global-filleted-polygon-projection.texi
    	documentation/unified-doc/yadd/geom-base/global-filleted-polyline.texi
    	documentation/unified-doc/yadd/geom-base/global-polygon-projection.texi
    	documentation/unified-doc/yadd/geom-base/global-polyline.texi
    	documentation/unified-doc/yadd/geom-base/horizontal-dimension.texi
    	documentation/unified-doc/yadd/geom-base/label.texi
    	documentation/unified-doc/yadd/geom-base/line.texi
    	documentation/unified-doc/yadd/geom-base/parallel-dimension.texi
    	documentation/unified-doc/yadd/geom-base/pie-chart.texi
    	documentation/unified-doc/yadd/geom-base/point.texi
    	documentation/unified-doc/yadd/geom-base/route-pipe.texi
    	documentation/unified-doc/yadd/geom-base/sphere.texi
    	documentation/unified-doc/yadd/geom-base/spherical-cap.texi
    	documentation/unified-doc/yadd/geom-base/torus.texi
    	documentation/unified-doc/yadd/geom-base/vertical-dimension.texi
    	documentation/unified-doc/yadd/gwl/base-ajax-graphics-sheet.texi
    	documentation/unified-doc/yadd/gwl/base-ajax-sheet.texi
    	documentation/unified-doc/yadd/gwl/base-form-control.texi
    	documentation/unified-doc/yadd/gwl/base-html-sheet.texi
    	documentation/unified-doc/yadd/gwl/menu-form-control.texi
    	documentation/unified-doc/yadd/gwl/sheet-section.texi
    	documentation/unified-doc/yadd/gwl/skeleton-ui-element.texi
    	documentation/unified-doc/yadd/gwl/web-drawing.texi
    	documentation/unified-doc/yadd/surf/approximated-curve.texi
    	documentation/unified-doc/yadd/surf/arc-curve.texi
    	documentation/unified-doc/yadd/surf/b-spline-curve.texi
    	documentation/unified-doc/yadd/surf/b-spline-surface.texi
    	documentation/unified-doc/yadd/surf/basic-surface.texi
    	documentation/unified-doc/yadd/surf/blended-solid.texi
    	documentation/unified-doc/yadd/surf/box-solid.texi
    	documentation/unified-doc/yadd/surf/boxed-curve.texi
    	documentation/unified-doc/yadd/surf/boxed-surface.texi
    	documentation/unified-doc/yadd/surf/compatible-surfaces.texi
    	documentation/unified-doc/yadd/surf/composed-curve.texi
    	documentation/unified-doc/yadd/surf/cone-solid.texi
    	documentation/unified-doc/yadd/surf/curve.texi
    	documentation/unified-doc/yadd/surf/cylinder-solid.texi
    	documentation/unified-doc/yadd/surf/decomposed-curves.texi
    	documentation/unified-doc/yadd/surf/dropped-curve.texi
    	documentation/unified-doc/yadd/surf/edge-blend-surface.texi
    	documentation/unified-doc/yadd/surf/elliptical-curve.texi
    	documentation/unified-doc/yadd/surf/extended-curve.texi
    	documentation/unified-doc/yadd/surf/extended-surface.texi
    	documentation/unified-doc/yadd/surf/fitted-curve.texi
    	documentation/unified-doc/yadd/surf/fitted-surface.texi
    	documentation/unified-doc/yadd/surf/global-filleted-polyline-curves.texi
    	documentation/unified-doc/yadd/surf/iso-curve.texi
    	documentation/unified-doc/yadd/surf/joined-surfaces.texi
    	documentation/unified-doc/yadd/surf/linear-curve.texi
    	documentation/unified-doc/yadd/surf/lofted-surface.texi
    	documentation/unified-doc/yadd/surf/planar-offset-curve.texi
    	documentation/unified-doc/yadd/surf/planar-section-curve.texi
    	documentation/unified-doc/yadd/surf/planar-section-curves.texi
    	documentation/unified-doc/yadd/surf/planar-surface.texi
    	documentation/unified-doc/yadd/surf/projected-curve.texi
    	documentation/unified-doc/yadd/surf/rectangular-surface.texi
    	documentation/unified-doc/yadd/surf/revolved-surface.texi
    	documentation/unified-doc/yadd/surf/revolved-surfaces.texi
    	documentation/unified-doc/yadd/surf/ruled-surface.texi
    	documentation/unified-doc/yadd/surf/spherical-surface.texi
    	documentation/unified-doc/yadd/surf/split-surface.texi
    	documentation/unified-doc/yadd/surf/surface-knot-reduction.texi
    	documentation/unified-doc/yadd/surf/swept-solid.texi
    	documentation/unified-doc/yadd/surf/trimmed-curve.texi
    	documentation/unified-doc/yadd/surf/trimmed-surface.texi
    
    Signed-off-by: default avatarTeodor Gelu Chiciudean <t.g.chiciudean@ke-works.ro>
    d010e085