Skip to content
Snippets Groups Projects
Commit 482a8fb7 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'master' into cleanVegaFemSceneObject 

Conflicts:
	include/smSimulators/smVegaFemSceneObject.h
	src/smContactHandling/smPenaltyContactHandling.cpp
	src/smSimulators/smVegaFemSceneObject.cpp

Clears merge conflicts and errors thereafter!
parents e384f5ab 3b8c8840
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 165 additions and 34 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment