Skip to content
Snippets Groups Projects
Commit 52f0a1ca authored by Mara Vogt's avatar Mara Vogt
Browse files

Merge remote-tracking branch 'origin/develop' into... 

Merge remote-tracking branch 'origin/develop' into 63-laden-mehrer-meshes-mit-materials-und-textures

[#63]merged develop into branch
parents bbb99877 f6111135
No related branches found
No related tags found
1 merge request!51Resolve "Laden mehrer Meshes mit Materials und Textures"
Pipeline #25652 failed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 451 additions and 134 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment