Skip to content
Snippets Groups Projects
Commit a377c154 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Merge branch 'depthabundance' into develop

Conflicts:
	GUI/coregui/Views/PropertyEditor/AwesomePropertyPresenter.cpp
parents 9ab1e72c 1a2e6c6c
No related branches found
No related tags found
Loading
Showing
with 139 additions and 685 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment