Sébastien Loriot a19023e2ef Merge branch 'General-fix_warning-sloriot' ...

Successfully tested in 4.3-Ic-73

2013-06-27 08:38:30 +02:00

..

internal/Intersections_3

Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller

2013-03-14 10:29:31 +01:00

Intersections_3

fix warnings mainly coming from the merge of the replace object feature branch

2013-06-24 08:44:47 +02:00

bbox_intersection_3.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

intersection_3_1.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

intersection_3.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Intersection_traits_3.h

update licenses that were incorrect after merging replace object feature branch

2013-06-21 15:06:17 +02:00

intersections.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Line_3_do_intersect.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Plane_3_do_intersect.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Point_3_do_intersect.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Ray_3_do_intersect.h

Merge branch 'inside_polyhedron_test-GF'

2013-06-20 16:34:02 +02:00

Triangle_3_Segment_3_do_intersect.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Tetrahedron_3_do_intersect.h

Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller

2012-12-04 17:57:53 +01:00

Triangle_3_Triangle_3_do_intersect.h

Merge next into this branch. There have been conflicts in the

2012-04-24 15:06:19 +00:00

Triangle_3_Triangle_3_intersection.h

intersection_return now also uses result_of

2012-12-10 17:20:36 +01:00