Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' ... That merges the following: | commit 5dbfeec3ae | Merge: fc407cf 5b9be0f | Author: Sébastien Loriot <sebastien.loriot@cgal.org> | Date: Fri Dec 12 15:29:51 2014 +0100 | | Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch | | Tested in CGAL-4.5.1-Ic-171 | | commit fc407cfebf | Merge: bd2c6f8 0c6153c | Author: Laurent Rineau <laurent.rineau@cgal.org> | Date: Mon Dec 1 17:38:48 2014 +0100 | | Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch | | Bug-fix in Mesh_3 with time stamps. | | Tested in CGAL-4.5.1-Ic-168. | Approved by the Release Manager. | | commit bd2c6f890f | Merge: ad53e42 c904f77 | Author: Laurent Rineau <laurent.rineau@cgal.org> | Date: Fri Nov 28 12:04:55 2014 +0100 | | Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch | | Bug fix: a property map was not lightweight. | | Tested in CGAL-4.5.1-Ic-167. | Approved by the Release Manager. | | commit ad53e42fb3 | Merge: 044660e b281d86 | Author: Laurent Rineau <laurent.rineau@cgal.org> | Date: Fri Nov 28 12:03:30 2014 +0100 | | Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch | | Fix the example examples/BGL_triangulation_2/emst.cpp: | the filtered (finite) triangulation was not used. | | Tested in CGAL-4.5.1-Ic-167. | Approved by the Release Manager. | | commit 044660eb48 | Merge: a096cdf 4464116 | Author: Laurent Rineau <laurent.rineau@cgal.org> | Date: Fri Nov 28 12:01:50 2014 +0100 | | Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch | | Fix the SSE macros when MinGW is used. | | Tested in CGAL-4.5.1-Ic-167. | Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.		2014-12-17 17:05:01 +01:00
..
CGAL	Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'	2014-12-17 17:05:01 +01:00