Skip to content

Commit

Permalink
Merge branch 'main' into devel
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/meshlab
  • Loading branch information
@alemuntoni
alemuntoni committed Jun 10, 2024
2 parents aef4e35 + 33f66af commit 9ee7c08
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/meshlab
Submodule meshlab updated 6 files
+1 −1 src/common/utilities/eigen_mesh_conversions.cpp
+2 −2 src/external/e57.cmake
+2 −0 src/meshlabplugins/edit_sample/edit_sample.cpp
+10 −10 src/meshlabplugins/io_e57/io_e57.cpp
+6 −6 src/meshlabplugins/io_e57/io_e57.h
+1 −1 src/vcglib

0 comments on commit 9ee7c08

Please sign in to comment.