Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch' ... # Conflicts: # Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp # Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp # Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp # Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp # Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h # Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h		2023-01-27 21:16:14 +01:00
..
demo	Merge branch '5.5.x-branch'	2023-01-27 21:16:14 +01:00
doc/GraphicsView	Merge branch 'master' into feature/bug_documentation_spell_20221113	2022-12-06 22:21:06 +01:00
include/CGAL	Merge branch 'master' into feature/bug_documentation_spell_20221113	2023-01-04 10:06:45 +01:00
package_info/GraphicsView	Correction of links	2019-04-11 21:37:05 +02:00
TODO	cosmetic changes to remove mentions of QT4	2015-07-07 18:00:43 +02:00