Skip to content

Commit

Permalink
Merge branch 'main' into devel
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/vcglib
  • Loading branch information
@alemuntoni
alemuntoni committed Nov 30, 2023
2 parents 36bce6d + ca1f5ab commit 9213493
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/vcglib
Submodule vcglib updated 5 files
+2 −2 wrap/io_trimesh/import_obj.h
+3 −2 wrap/io_trimesh/import_ply.h
+5 −3 wrap/ply/plylib.cpp
+1 −1 wrap/ply/plylib.h
+0 −23 wrap/ply/plystuff.h

0 comments on commit 9213493

Please sign in to comment.