Merge changes from trunk

(bzr r14949.1.64)

1 files changed, 0 insertions, 131 deletions

diff --git a/src/2geom/Makefile_insert b/src/2geom/Makefile_insert
deleted file mode 100644
index 4d41de297..000000000
--- a/src/2geom/Makefile_insert
+++ /dev/null
@@ -1,131 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-2geom/all: 2geom/lib2geom.a
-
-2geom/clean:
-	rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS)
-
-2geom_lib2geom_a_SOURCES = \
-	2geom/2geom.h \
-	2geom/affine.cpp \
-	2geom/affine.h \
-	2geom/angle.h \
-	2geom/basic-intersection.cpp \
-	2geom/basic-intersection.h \
-	2geom/bezier-clipping.cpp \
-	2geom/bezier-curve.cpp \
-	2geom/bezier-curve.h \
-	2geom/bezier.cpp \
-	2geom/bezier.h \
-	2geom/bezier-to-sbasis.h \
-	2geom/bezier-utils.cpp \
-	2geom/bezier-utils.h \
-	2geom/cairo-path-sink.cpp \
-	2geom/cairo-path-sink.h \
-	2geom/choose.h \
-	2geom/circle.cpp \
-	2geom/circle.h \
-	2geom/circulator.h \
-	2geom/CMakeLists.txt \
-	2geom/concepts.h \
-	2geom/conicsec.cpp \
-	2geom/conicsec.h \
-	2geom/conic_section_clipper_cr.h \
-	2geom/conic_section_clipper.h \
-	2geom/conic_section_clipper_impl.cpp \
-	2geom/conic_section_clipper_impl.h \
-	2geom/convex-hull.cpp \
-	2geom/convex-hull.h \
-	2geom/coord.cpp \
-	2geom/coord.h \
-	2geom/crossing.cpp \
-	2geom/crossing.h \
-	2geom/curve.cpp \
-	2geom/curve.h \
-	2geom/curves.h \
-	2geom/d2.h \
-	2geom/d2-sbasis.cpp \
-	2geom/ellipse.cpp \
-	2geom/ellipse.h \
-	2geom/elliptical-arc.cpp \
-	2geom/elliptical-arc.h \
-	2geom/elliptical-arc-from-sbasis.cpp \
-	2geom/exception.h \
-	2geom/forward.h \
-	2geom/generic-interval.h \
-	2geom/generic-rect.h \
-	2geom/geom.cpp \
-	2geom/geom.h \
-	2geom/intersection.h \
-	2geom/intersection-graph.cpp \
-	2geom/intersection-graph.h \
-	2geom/interval.h \
-	2geom/int-interval.h \
-	2geom/int-point.h \
-	2geom/int-rect.h \
-	2geom/linear.h \
-	2geom/line.cpp \
-	2geom/line.h \
-	2geom/math-utils.h \
-	2geom/nearest-time.cpp \
-	2geom/nearest-time.h \
-	2geom/ord.h \
-	2geom/path.cpp \
-	2geom/path.h \
-	2geom/path-intersection.cpp \
-	2geom/path-intersection.h \
-	2geom/path-sink.cpp \
-	2geom/path-sink.h \
-	2geom/pathvector.cpp \
-	2geom/pathvector.h \
-	2geom/piecewise.cpp \
-	2geom/piecewise.h \
-	2geom/point.cpp \
-	2geom/point.h \
-	2geom/polynomial.cpp \
-	2geom/polynomial.h \
-	2geom/ray.h \
-	2geom/rect.cpp \
-	2geom/rect.h \
-	2geom/recursive-bezier-intersection.cpp \
-	2geom/sbasis-2d.cpp \
-	2geom/sbasis-2d.h \
-	2geom/sbasis.cpp \
-	2geom/sbasis-curve.h \
-	2geom/sbasis-geometric.cpp \
-	2geom/sbasis-geometric.h \
-	2geom/sbasis.h \
-	2geom/sbasis-math.cpp \
-	2geom/sbasis-math.h \
-	2geom/sbasis-poly.cpp \
-	2geom/sbasis-poly.h \
-	2geom/sbasis-roots.cpp \
-	2geom/sbasis-to-bezier.cpp \
-	2geom/sbasis-to-bezier.h \
-	2geom/solve-bezier.cpp \
-	2geom/solve-bezier-one-d.cpp \
-	2geom/solve-bezier-parametric.cpp \
-	2geom/solver.h \
-	2geom/svg-path-parser.cpp \
-	2geom/svg-path-parser.h \
-	2geom/svg-path-writer.cpp \
-	2geom/svg-path-writer.h \
-	2geom/sweep-bounds.cpp \
-	2geom/sweep-bounds.h \
-	2geom/sweeper.h \
-	2geom/toposweep.cpp \
-	2geom/toposweep.h \
-	2geom/transforms.cpp \
-	2geom/transforms.h \
-	2geom/utils.cpp \
-	2geom/utils.h \
-	2geom/numeric/fitting-model.h \
-	2geom/numeric/fitting-tool.h \
-	2geom/numeric/linear_system.h \
-	2geom/numeric/matrix.cpp \
-	2geom/numeric/matrix.h \
-	2geom/numeric/symmetric-matrix-fs.h \
-	2geom/numeric/symmetric-matrix-fs-operation.h \
-	2geom/numeric/symmetric-matrix-fs-trace.h \
-	2geom/numeric/vector.h
-