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 Jan 7, 2025
2 parents 8502c77 + f17f9c2 commit 21e5c4f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/meshlab
Submodule meshlab updated 3 files
+4 −1 src/meshlabplugins/filter_sampling/filter_sampling.cpp
+8 −2 src/meshlabplugins/filter_texture/filter_texture.cpp
+1 −0 src/meshlabplugins/filter_texture/rastering.h

0 comments on commit 21e5c4f

Please sign in to comment.