Maxime Gimeno 2a49dfcb05 Fix conflict

2019-01-11 09:47:34 +01:00

..

Buffer_objects.h

Update license files

2018-06-04 12:00:21 +02:00

Edge_container.h

Add missing dummy useless doc for getters and setters

2018-06-26 14:57:44 +02:00

exceptions.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Point_container.h

Add missing dummy useless doc for getters and setters

2018-06-26 14:57:44 +02:00

Polyhedron_demo_io_plugin_interface.h

Remove problematic gl calls

2018-06-29 18:40:25 +02:00

Polyhedron_demo_plugin_helper.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Polyhedron_demo_plugin_interface.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Primitive_container.h

Add missing dummy useless doc for getters and setters

2018-06-26 14:57:44 +02:00

Scene_draw_interface.h

Merge pull request #1436 from lrineau/CGAL-new_cmake-GF

2017-12-05 18:20:05 +01:00

Scene_group_item.h

Fix c3t3 and add action to viewer to set total number of passes

2018-06-04 12:00:21 +02:00

Scene_interface.h

Rename functions.

2018-11-19 12:03:17 +01:00

Scene_item_config.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Scene_item_rendering_helper.h

Fix warnings in Three documentation.

2018-11-19 14:09:51 +01:00

Scene_item_with_properties.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Scene_item.h

Fix conflict

2019-01-11 09:47:34 +01:00

Scene_print_item_interface.h

Fix warning

2017-11-23 11:19:23 +01:00

Scene_transparent_interface.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Scene_zoomable_item_interface.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

TextRenderer.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Three.h

Add default points/lines/normals size in preferences.

2018-10-31 12:26:36 +01:00

Triangle_container.h

Fix conflict

2019-01-11 09:47:34 +01:00

Viewer_config.h

add SPDX identifier for files under the GPL-3+ license

2017-11-12 10:17:51 +01:00

Viewer_interface.h

Fix merge conflicts

2018-11-12 13:02:52 +01:00