Andreas Fabri 5b62f06871 Fix merge conflicts

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

..

Dynamic_property_map.h

use a vector for dynamic properties of const Surface_mesh

2018-10-25 17:05:21 +02:00

Index_property_map.h

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

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

property_map.h

Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF

2018-10-30 15:50:17 +01:00