Skip to content
Snippets Groups Projects
Commit d301ef2d authored by Celine Durniak's avatar Celine Durniak
Browse files

Merge branch 'tilted_particles' into develop 

Conflicts:
	Core/Samples/inc/Layer.h
	Core/Samples/inc/LayerDecorator.h
	Core/Samples/src/Layer.cpp
	Doc/UserManual/UserManual.pdf
	Doc/UserManual/UserManual.tex
parents a88a532c 4bb0fc29
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8845 additions and 61 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment