Skip to content
Snippets Groups Projects
Commit df34df63 authored by Sebastian Freitag's avatar Sebastian Freitag
Browse files

Merge branch 'release/v17.12.0'

# Conflicts:
#	resources/models/bunny.obj
parents cda0f60e 037b4c8e
Branches
Tags v17.12.0
3 merge requests!148feature/#480_Create_a_smaller_test _mesh_for_combustion_demo,!141WIP: Resolve "Copy standard assets to build folder and remove resource path",!85WIP: Feature/234 continuous delivery
Showing
with 844 additions and 220 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment