Guillaume Damiand a666cb0857 Resolve conflict

2020-01-16 08:33:24 +01:00

..

auto_link

First pass on removing license notice in header for LGPL files

2019-10-19 15:40:30 +02:00

export

First pass on removing license notice in header for LGPL files

2019-10-19 15:40:30 +02:00

Qt

Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand

2020-01-15 17:24:06 +01:00

Buffer_for_vao.h

Resolve conflict

2020-01-16 08:33:24 +01:00